| commit | 3c506efd7e0f615bd9603ce8c06bc4a896952599 | [log] [tgz] |
|---|---|---|
| author | Pekka Enberg <penberg@cs.helsinki.fi> | Mon Dec 29 11:47:05 2008 +0200 |
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | Mon Dec 29 11:47:05 2008 +0200 |
| tree | 6ebc840535e9d93bf60e21e940a5f4558275a89d | |
| parent | fd37617e69fb865348d012eb1413aef0141ae2de [diff] | |
| parent | 773ff60e841461cb1f9374a713ffcda029b8c317 [diff] |
Merge branch 'topic/failslab' into for-linus Conflicts: mm/slub.c Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>