Skip to content
Commit 3f30a09a authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'pxa-all' into devel 

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c
parents 9e165acf fda50a1c
Expand all 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