]> 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)
commit13ed25fde71862df1b4d1d734767034ba74add92
tree0e8d89e0ceffb9001da2082998222da8b39185c1
parent2d5ed861d433052fc237f1c8625295e15305eceb
parent96f7ebd9309e8e13c4d8472b7010d9864d3e7549
Merge branch 'slab/next' into for-linus

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