Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Jul 2008 18:26:14 +0000 (11:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Jul 2008 18:26:14 +0000 (11:26 -0700)
commitb9d2252c1e44fa83a4e65fdc9eb93db6297c55af
tree7db5a11d1d57a56fc330b8313680bbbe4eb3a564
parentb312bf359e20cc39c00d480fd40a24c245d80bf7
parente79aec291da55aa322ddb5d8f3bb04cdf69470d5
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:
  slab: rename slab_destroy_objs
  slub: current is always valid
  slub: Add check for kfree() of non slab objects.