Sascha Hauer 467a675626 Merge branch 'master' into next ... Conflicts: arch/arm/boards/usb-a926x/init.c arch/arm/mach-pxa/include/mach/clock.h arch/arm/mach-pxa/speed-pxa27x.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>		2011-12-15 19:58:56 +01:00
..
mach	Merge branch 'master' into next	2011-12-15 19:58:56 +01:00
plat	arm/mach-pxa: Initial Intel/Marvell PXA support	2011-12-05 09:30:27 +01:00