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)
commitc402f98c6d43f22b4c6d7b3db9d7099611cdcaec
tree3ea2fe716c2e1a42716ab1a16bbe1cc5836fd864
parent4f9faaace217b854ae1e1746ee4ac44688ddadbd
parentf6acb63508700b5f8cd817082b62c96ba907775e
Merge branch 'for-linus' of git://git./linux/kernel/git/penberg/slab-2.6

* '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