Skip to content
Commit 3c506efd authored by Pekka Enberg's avatar Pekka Enberg
Browse files

Merge branch 'topic/failslab' into for-linus 



Conflicts:

	mm/slub.c

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parents fd37617e 773ff60e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment