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

Merge branch 'devel-stable' into for-linus 

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm/plat-versatile/Kconfig
Merge fixes:
	arch/arm/mach-integrator/Kconfig
	drivers/clocksource/Kconfig
parents 4ba21e86 6c634726
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