1. 06 1月, 2011 3 次提交
  2. 04 12月, 2010 34 次提交
  3. 30 10月, 2010 3 次提交
    • L
      Merge git://git.infradead.org/mtd-2.6 · 79346507
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6: (82 commits)
        mtd: fix build error in m25p80.c
        mtd: Remove redundant mutex from mtd_blkdevs.c
        MTD: Fix wrong check register_blkdev return value
        Revert "mtd: cleanup Kconfig dependencies"
        mtd: cfi_cmdset_0002: make sector erase command variable
        mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips
        mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode
        mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one
        block2mtd: dubious assignment
        P4080/mtd: Fix the freescale lbc issue with 36bit mode
        P4080/eLBC: Make Freescale elbc interrupt common to elbc devices
        mtd: phram: use KBUILD_MODNAME
        mtd: OneNAND: S5PC110: Fix double call suspend & resume function
        mtd: nand: fix MTD_MODE_RAW writes
        jffs2: use kmemdup
        mtd: sm_ftl: cosmetic, use bool when possible
        mtd: r852: remove useless pci powerup/down from suspend/resume routines
        mtd: blktrans: fix a race vs kthread_stop
        mtd: blktrans: kill BKL
        mtd: allow to unload the mtdtrans module if its block devices aren't open
        ...
      
      Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c
      79346507
    • L
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 706d4b12
      Linus Torvalds 提交于
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (215 commits)
        ARM: memblock: setup lowmem mappings using memblock
        ARM: memblock: move meminfo into find_limits directly
        ARM: memblock: convert free_highpages() to use memblock
        ARM: move freeing of highmem pages out of mem_init()
        ARM: memblock: convert memory detail printing to use memblock
        ARM: memblock: use memblock to free memory into arm_bootmem_init()
        ARM: memblock: use memblock when initializing memory allocators
        ARM: ensure membank array is always sorted
        ARM: 6466/1: implement flush_icache_all for the rest of the CPUs
        ARM: 6464/2: fix spinlock recursion in adjust_pte()
        ARM: fix memblock breakage
        ARM: 6465/1: Fix data abort accessing proc_info from __lookup_processor_type
        ARM: 6460/1: ixp2000: fix type of ixp2000_timer_interrupt
        ARM: 6449/1: Fix for compiler warning of uninitialized variable.
        ARM: 6445/1: fixup TCM memory types
        ARM: imx: Add wake functionality to GPIO
        ARM: mx5: Add gpio-keys to mx51 babbage board
        ARM: imx: Add gpio-keys to plat-mxc
        mx31_3ds: Fix spi registration
        mx31_3ds: Fix the logic for detecting the debug board
        ...
      706d4b12
    • V
      ipc: shm: fix information leak to userland · 3af54c9b
      Vasiliy Kulikov 提交于
      The shmid_ds structure is copied to userland with shm_unused{,2,3}
      fields unitialized.  It leads to leaking of contents of kernel stack
      memory.
      Signed-off-by: NVasiliy Kulikov <segooon@gmail.com>
      Acked-by: NAl Viro <viro@ZenIV.linux.org.uk>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3af54c9b