From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Jun 2009 16:41:25 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... 
X-Git-Tag: v2.6.31-rc1~290
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=4ce4b1b73b4dd37e4a70390976ac0bcf7038d6f9;p=net-next-2.6.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

4ce4b1b73b4dd37e4a70390976ac0bcf7038d6f9