1. 25 Sep, 2009 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 · b9b9df62
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
        eCryptfs: Prevent lower dentry from going negative during unlink
        eCryptfs: Propagate vfs_read and vfs_write return codes
        eCryptfs: Validate global auth tok keys
        eCryptfs: Filename encryption only supports password auth tokens
        eCryptfs: Check for O_RDONLY lower inodes when opening lower files
        eCryptfs: Handle unrecognized tag 3 cipher codes
        ecryptfs: improved dependency checking and reporting
        eCryptfs: Fix lockdep-reported AB-BA mutex issue
        ecryptfs: Remove unneeded locking that triggers lockdep false positives
      b9b9df62
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://repo.or.cz/cris-mirror · 5f8fe427
      Linus Torvalds authored
      * 'for-linus' of git://repo.or.cz/cris-mirror:
        CRIS: Cleanup linker script using new linker script macros.
        ARRAY_SIZE changes
        CRIS: convert to asm-generic/hardirq.h
        CRISv10: Don't autonegotiate if autonegotiation is off
        CRIS: fix defconfig build failure
        CRIS: add pgprot_noncached
      5f8fe427
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · d9fbd9a2
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)
        ARM: 5719/1: [AT91] Fix AC97 breakage
        ARM: 5721/1: MMCI enable the use of a regulator
        ARM: 5720/1: Move MMCI header to amba include dir
        ARM: 5718/1: Sane busids for RealView board components
        ARM: 5715/1: Make kprobes unregistration SMP safe
        ARM: 5711/1: locomo.c: CodingStyle cleanups
        ARM: 5710/1: at91: add AC97 support to at91sam9rl and at91sam9rlek board
        ARM: 5709/1: at91: add AC97 support to at91sam9g45 series and at91sam9m10g45ek board
        ARM: 5621/1: at91/dmaengine: integration of at_hdmac driver in at91sam9g45 series
        ARM: 5620/1: at91/dmaengine: integration of at_hdmac driver in at91sam9rl
        ARM: Add support for checking access permissions on prefetch aborts
        ARM: Separate out access error checking
        ARM: Ensure correct might_sleep() check in pagefault path
        ARM: Update page fault handling for new OOM techniques
        ARM: Provide definitions and helpers for decoding the FSR register
        ARM: 5712/1: SA1100: initialise spinlock in DMA code
        ARM: s3c: fix check of index into s3c_gpios[]
        ARM: spitz: fix touchscreen max presure
        ARM: STMP3xxx: deallocation with negative index of descriptors[]
        Thumb-2: Correctly handle undefined instructions in the kernel
        ...
      d9fbd9a2
    • Linus Torvalds's avatar
      Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · f25f60be
      Linus Torvalds authored
      * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        nfs[23] tcp breakage in mount with binary options
        net: fix htmldocs sunrpc, clnt.c
      f25f60be
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · d7757be1
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IPoIB: Don't turn on carrier for a non-active port
        IB/mthca: Fix access to freed memory in catastrophic event handling
        mlx4_core: Pass cache line size to device FW
        RDMA/nes: Remove duplicate .ndo_set_mac_address field initialization
        IB/mad: Fix lock-lock-timer deadlock in RMPP code
      d7757be1
  2. 24 Sep, 2009 35 commits