Merge branch 'slab/next' into for-linus
authorPekka Enberg <penberg@kernel.org>
Mon, 23 May 2011 16:50:39 +0000 (19:50 +0300)
committerPekka Enberg <penberg@kernel.org>
Mon, 23 May 2011 16:50:39 +0000 (19:50 +0300)
commitbfb91fb650e988c3c347e50fc75fedb7d4f0c018
tree0e8d89e0ceffb9001da2082998222da8b39185c1
parentcaebc160ce3f76761cc62ad96ef6d6f30f54e3dd
parent3e0c2ab67e48f77c2da0a5c826aac397792a214e
Merge branch 'slab/next' into for-linus

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