Skip to content
GitLab
Commit a02efb90 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'origin' into master 

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/include/asm/page.h
parents 84dfcb4b 2515ddc6
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
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