| commit | bfb91fb650e988c3c347e50fc75fedb7d4f0c018 | [log] [tgz] |
|---|---|---|
| author | Pekka Enberg <penberg@kernel.org> | Mon May 23 19:50:39 2011 +0300 |
| committer | Pekka Enberg <penberg@kernel.org> | Mon May 23 19:50:39 2011 +0300 |
| tree | 0e8d89e0ceffb9001da2082998222da8b39185c1 | |
| parent | caebc160ce3f76761cc62ad96ef6d6f30f54e3dd [diff] | |
| parent | 3e0c2ab67e48f77c2da0a5c826aac397792a214e [diff] |
Merge branch 'slab/next' into for-linus Conflicts: mm/slub.c