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-05-20 12:17:39 -04:00
2008-07-24 08:30:48 -04:00
2008-04-18 09:50:00 -07:00
2008-04-18 09:50:00 -07:00
2008-05-20 12:17:39 -04:00
2008-05-20 12:17:39 -04:00