Commit 5a89770d authored Oct 07, 2008 by Russell King Committed by Russell King Oct 07, 2008

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

Some changes are not shown.

For a faster browsing experience, only 20 of 402+ files are shown. Download one of the files below to see all changes.

Please register or to comment