Skip to content
Commit 5a89770d authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branches 'pxa-core' and 'pxa-machines' into pxa-all 

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
parents c46c9482 af7c951d
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment