]> err.no Git - linux-2.6/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Aug 2008 23:21:33 +0000 (16:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Aug 2008 23:21:33 +0000 (16:21 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  SLUB: dynamic per-cache MIN_PARTIAL
  mm: unexport ksize


Trivial merge