commit | 5caf5c7dc2d303b770e426f7e2238df882f1773b | [log] [tgz] |
---|---|---|
author | Pekka Enberg <penberg@cs.helsinki.fi> | Wed Jun 17 08:30:54 2009 +0300 |
committer | Pekka Enberg <penberg@cs.helsinki.fi> | Wed Jun 17 08:30:54 2009 +0300 |
tree | 1dddb1941da34326e8e8becef10761d2d5d7fcc9 | |
parent | e03ab9d415c47e1ff485b646f95604d3e3a91708 [diff] | |
parent | 964cf35c88f93b4927dbc4e950dfa4d880c7f9d1 [diff] |
Merge branch 'slub/earlyboot' into for-linus Conflicts: mm/slub.c