Merge branch 'slub/earlyboot' into for-linus
authorPekka Enberg <penberg@cs.helsinki.fi>
Wed, 17 Jun 2009 05:30:54 +0000 (08:30 +0300)
committerPekka Enberg <penberg@cs.helsinki.fi>
Wed, 17 Jun 2009 05:30:54 +0000 (08:30 +0300)
commit5caf5c7dc2d303b770e426f7e2238df882f1773b
tree1dddb1941da34326e8e8becef10761d2d5d7fcc9
parente03ab9d415c47e1ff485b646f95604d3e3a91708
parent964cf35c88f93b4927dbc4e950dfa4d880c7f9d1
Merge branch 'slub/earlyboot' into for-linus

Conflicts:
mm/slub.c
mm/slub.c