Skip to content
Commit 542f869f authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel 



Conflicts:
	arch/arm/mm/Kconfig

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parents e8b374bb 839e642f
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