tree 80c91ce14fc1ee4d1585ba665a41be6420cabcbc
parent 1cf3eb2ff6b0844c678f2f48d0053b9d12b7da67
parent 3718909448116bf4411445468c58acc946379f92
author Pekka Enberg <penberg@cs.helsinki.fi> 1233566329 +0200
committer Pekka Enberg <penberg@cs.helsinki.fi> 1233566329 +0200

Merge branches 'topic/slab/fixes' and 'topic/slub/fixes' into for-linus