1. 16 Oct, 2007 38 commits
  2. 15 Oct, 2007 2 commits
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 65a6ec0d
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (95 commits)
        [ARM] 4578/1: CM-x270: PCMCIA support
        [ARM] 4577/1: ITE 8152 PCI bridge support
        [ARM] 4576/1: CM-X270 machine support
        [ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()
        [ARM] pxa: move pxa_set_mode() from pxa2xx_mainstone.c to mainstone.c
        [ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
        [ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols
        [ARM] pxa: PXA3xx base support
        [NET] smc91x: fix PXA DMA support code
        [SERIAL] Fix console initialisation ordering
        [ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
        [ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
        [ARM] 4600/1: fix kernel build failure with build-id-supporting binutils
        [ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
        [ARM] Rename consistent_sync() as dma_cache_maint()
        [ARM] 4572/1: ep93xx: add cirrus logic edb9307 support
        [ARM] 4596/1: S3C2412: Correct IRQs for SDI+CF and add decoding support
        [ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
        [ARM] 4594/1: ns9xxx: use the new gpio functions
        [ARM] 4593/1: ns9xxx: implement generic clockevents
        ...
      65a6ec0d
    • Linus Torvalds's avatar
      Merge branch 'locks' of git://linux-nfs.org/~bfields/linux · 541010e4
      Linus Torvalds authored
      * 'locks' of git://linux-nfs.org/~bfields/linux:
        nfsd: remove IS_ISMNDLCK macro
        Rework /proc/locks via seq_files and seq_list helpers
        fs/locks.c: use list_for_each_entry() instead of list_for_each()
        NFS: clean up explicit check for mandatory locks
        AFS: clean up explicit check for mandatory locks
        9PFS: clean up explicit check for mandatory locks
        GFS2: clean up explicit check for mandatory locks
        Cleanup macros for distinguishing mandatory locks
        Documentation: move locks.txt in filesystems/
        locks: add warning about mandatory locking races
        Documentation: move mandatory locking documentation to filesystems/
        locks: Fix potential OOPS in generic_setlease()
        Use list_first_entry in locks_wake_up_blocks
        locks: fix flock_lock_file() comment
        Memory shortage can result in inconsistent flocks state
        locks: kill redundant local variable
        locks: reverse order of posix_locks_conflict() arguments
      541010e4