From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 15 Feb 2008 05:24:02 +0000 (-0800)
Subject: Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm
X-Git-Tag: v2.6.25-rc2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f527cf405017e60ceb28f84e2d60ab16fc34f209;p=linux-2.6-omap-h63xx.git

Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm

* 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm:
  slub: Support 4k kmallocs again to compensate for page allocator slowness
  slub: Fallback to kmalloc_large for failing higher order allocs
  slub: Determine gfpflags once and not every time a slab is allocated
  make slub.c:slab_address() static
  slub: kmalloc page allocator pass-through cleanup
  slab: avoid double initialization & do initialization in 1 place
---

f527cf405017e60ceb28f84e2d60ab16fc34f209