tree 28fba62cf218ef484113ab4335e3f1f3fbecd484
parent 90aaa53c5a5af33a061313681d8f3234712b866b
parent d7de4c1dc3a2faca0bf05d9e342f885cb2696766
author Linus Torvalds <torvalds@linux-foundation.org> 1226604646 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1226604646 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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