]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/failslab' into for-linus
authorPekka Enberg <penberg@cs.helsinki.fi>
Mon, 29 Dec 2008 09:47:05 +0000 (11:47 +0200)
committerPekka Enberg <penberg@cs.helsinki.fi>
Mon, 29 Dec 2008 09:47:05 +0000 (11:47 +0200)
commit7f7871ac0ca63e954cb1fe7380903eaae37fa0bf
tree6ebc840535e9d93bf60e21e940a5f4558275a89d
parentd5226ab0b3d0b432ef9b5ccddecc2b49ae83e9f9
parent36e1494345b281d06103e6461305b51385b3807d
Merge branch 'topic/failslab' into for-linus

Conflicts:

mm/slub.c

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
mm/slab.c
mm/slub.c