From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 7 Mar 2008 21:49:32 +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-rc5~9
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=bb799dcadd60796ab13d32a698d92bfb92ce0d5c;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: fix typo in Documentation/vm/slub.txt
  slab: NUMA slab allocator migration bugfix
  slub: Do not cross cacheline boundaries for very small objects
  slab - use angle brackets for include of kmalloc_sizes.h
  slab numa fallback logic: Do not pass unfiltered flags to page allocator
  slub statistics: Fix check for DEACTIVATE_REMOTE_FREES
---

bb799dcadd60796ab13d32a698d92bfb92ce0d5c