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-07-20 17:12:35 -07:00
2008-08-04 17:12:07 -07:00
2008-08-04 17:12:07 -07:00
2008-04-30 08:29:47 -07:00
2008-07-30 09:41:46 -07:00
2008-07-22 13:03:28 -07:00
2008-07-28 18:10:29 +09:00