Skip to content
Commit 0b019a41 authored by Russell King's avatar Russell King
Browse files

Merge branches 'master' and 'devel' into for-linus 

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig
parents 5f6878b0 054d5c92
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