1. 02 8月, 2010 38 次提交
  2. 31 7月, 2010 2 次提交
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · a63ecd83
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        cyber2000fb: fix console in truecolor modes
        cyber2000fb: fix machine hang on module load
        SA1111: Eliminate use after free
        ARM: Fix Versatile/Realview/VExpress MMC card detection sense
        ARM: 6279/1: highmem: fix SMP preemption bug in kmap_high_l1_vipt
        ARM: Add barriers to io{read,write}{8,16,32} accessors as well
        ARM: 6273/1: Add barriers to the I/O accessors if ARM_DMA_MEM_BUFFERABLE
        ARM: 6272/1: Convert L2x0 to use the IO relaxed operations
        ARM: 6271/1: Introduce *_relaxed() I/O accessors
        ARM: 6275/1: ux500: don't use writeb() in uncompress.h
        ARM: 6270/1: clean files in arch/arm/boot/compressed/
        ARM: Fix csum_partial_copy_from_user()
      a63ecd83
    • L
      Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · fc71ff8a
      Linus Torvalds 提交于
      * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        NFS: Ensure that writepage respects the nonblock flag
        NFS: kswapd must not block in nfs_release_page
        nfs: include space for the NUL in root path
      fc71ff8a