1. 18 6月, 2009 2 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 4ce4b1b7
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        SLUB: Fix early boot GFP_DMA allocations
        SLUB: Don't print out OOM warning for __GFP_NOFAIL
        SLUB: fix build when !SLUB_DEBUG
        SLUB: Out-of-memory diagnostics
        slab: document kzfree() zeroing behavior
        slab: fix generic PAGE_POISONING conflict with SLAB_RED_ZONE
        slob: use PG_slab for identifying SLOB pages
      4ce4b1b7
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 9cb0fbf7
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (47 commits)
        MIPS: Add hibernation support
        MIPS: Move Cavium CP0 hwrena impl bits to cpu-feature-overrides.h
        MIPS: Allow CPU specific overriding of CP0 hwrena impl bits.
        MIPS: Kconfig Add SYS_SUPPORTS_HUGETLBFS and enable it for some systems.
        Hugetlbfs: Enable hugetlbfs for more systems in Kconfig.
        MIPS: TLB support for hugetlbfs.
        MIPS: Add hugetlbfs page defines.
        MIPS: Add support files for hugetlbfs.
        MIPS: Remove unused parameters from iPTE_LW.
        Staging: Add octeon-ethernet driver files.
        MIPS: Export erratum function needed by octeon-ethernet driver.
        MIPS: Cavium-Octeon: Add more chip specific feature tests.
        MIPS: Cavium-Octeon: Add more board type constants.
        MIPS: Export cvmx_sysinfo_get needed by octeon-ethernet driver.
        MIPS: Add named alloc functions to OCTEON boot monitor memory allocator.
        MIPS: Alchemy: devboards: Convert to gpio calls.
        MIPS: Alchemy: xxs1500: use linux gpio api.
        MIPS: Alchemy: MTX-1: Use linux gpio api.
        MIPS: Alchemy: Rewrite GPIO support.
        MIPS: Alchemy: Remove unused au1000_gpio.h header
        ...
      9cb0fbf7
  2. 17 6月, 2009 38 次提交