From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 8 Feb 2008 02:22:29 +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~284
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c00f08d705e149fbfaf7a252b4d4fbb7affdcc96;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:
  SLUB: fix checkpatch warnings
  Use non atomic unlock
  SLUB: Support for performance statistics
  SLUB: Alternate fast paths using cmpxchg_local
  SLUB: Use unique end pointer for each slab page.
  SLUB: Deal with annoying gcc warning on kfree()
---

c00f08d705e149fbfaf7a252b4d4fbb7affdcc96