Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Nov 2008 19:30:46 +0000 (11:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Nov 2008 19:30:46 +0000 (11:30 -0800)
commit2d1595ad8766c9cbab81d259168c00261d382ac5
tree28fba62cf218ef484113ab4335e3f1f3fbecd484
parent90aaa53c5a5af33a061313681d8f3234712b866b
parentd7de4c1dc3a2faca0bf05d9e342f885cb2696766
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: document SLAB_DESTROY_BY_RCU
  Kconfig: SLUB is the default slab allocator