Skip to content
Commit 46e387bb authored by Andi Kleen's avatar Andi Kleen
Browse files

Merge branch 'hwpoison-hugepages' into hwpoison 

Conflicts:
	mm/memory-failure.c
parents e9d08567 3ef8fd7f
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