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

Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable 

Conflicts:
	arch/arm/Kconfig
parents d50f58bb e69edc79
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