Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 May 2008 17:21:26 +0000 (10:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 May 2008 17:21:26 +0000 (10:21 -0700)
commit1434b65731963207a4cc84bd87e6191e34321986
tree07f58551b451675c2f85ebe88e5feb8971577d78
parent4934ed888e6fe78d9d339471fb870819da911e8b
parent76994412f8e824e79a593d6777ec327d85f942b2
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: ksize() abuse checks
  slob: Fix to return wrong pointer