Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jun 2009 16:41:25 +0000 (09:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jun 2009 16:41:25 +0000 (09:41 -0700)
commit4ce4b1b73b4dd37e4a70390976ac0bcf7038d6f9
tree2e8de1e183eb5f8c7b55b22d65bc698367e7f8a8
parent9cb0fbf7f8cbbd16218a4fb5983ac55fbc031929
parent5caf5c7dc2d303b770e426f7e2238df882f1773b
Merge branch 'for-linus' of git://git./linux/kernel/git/penberg/slab-2.6

* '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