Skip to content
Commit 7fecc34e authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'pxa-tosa' into pxa 

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/tosa.c
	arch/arm/mach-pxa/spitz.c
parents a9da4f7e 93887049
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