From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Feb 2008 20:14:55 +0000 (-0800)
Subject: Merge branch 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm
X-Git-Tag: v2.6.25-rc1~1056
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2c8296f8cf0ec40867965dddef3dfe92f73b38f4;p=linux-2.6-omap-h63xx.git

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

* 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm:
  Explain kmem_cache_cpu fields
  SLUB: Do not upset lockdep
  SLUB: Fix coding style violations
  Add parameter to add_partial to avoid having two functions
  SLUB: rename defrag to remote_node_defrag_ratio
  Move count_partial before kmem_cache_shrink
  SLUB: Fix sysfs refcounting
  slub: fix shadowed variable sparse warnings
---

2c8296f8cf0ec40867965dddef3dfe92f73b38f4