Merge branch 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Feb 2008 20:14:55 +0000 (12:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Feb 2008 20:14:55 +0000 (12:14 -0800)
commit2c8296f8cf0ec40867965dddef3dfe92f73b38f4
tree9d50fb09cd08a2677b3590668cbd49a7aa7f7a63
parentd2fc0bacd5c438cb459fdf531eff00ab18422a00
parentda89b79ed06bac8e9b5b6874d4efc5382e1091de
Merge branch 'slub-linus' of git://git./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