Skip to content
Commit 82a0a1cc authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'origin/master' into next 

Manual merge of:
	arch/powerpc/include/asm/pgtable-ppc32.h
parents 8d30c14c 5955c7a2
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