Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 May 2008 17:18:40 +0000 (10:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 May 2008 17:18:40 +0000 (10:18 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slub: #ifdef simplification
  slabinfo: Support printout of the number of fallbacks
  slub: Whitespace cleanup and use of strict_strtoul


Trivial merge