]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9a799d04452506ef9d6e58740c62b29ee7788666
tree0e8d89e0ceffb9001da2082998222da8b39185c1
parent80d74bd8f3b99644179ced25cd0e19e23b9e2a31
parent96f7ebd9309e8e13c4d8472b7010d9864d3e7549
Merge branch 'slab/next' into for-linus

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