Russell King 5a89770daa 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
2008-10-07 19:08:56 +01:00
..
2008-08-25 01:18:06 -04:00
2008-08-01 13:03:49 -07:00
2008-07-26 12:00:11 -07:00
2008-07-30 09:41:45 -07:00
2008-07-26 12:00:09 -07:00