9
0
Fork 0
barebox/arch/arm/mach-pxa
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
..
include Merge branch 'master' into next 2011-12-15 19:58:56 +01:00
Kconfig pxa: add type to Kconfig choice 2011-12-07 13:06:46 +01:00
Makefile arm/mach-pxa: Initial Intel/Marvell PXA support 2011-12-05 09:30:27 +01:00
clocksource.c arm/mach-pxa: Initial Intel/Marvell PXA support 2011-12-05 09:30:27 +01:00
common.c arm/mach-pxa: Initial Intel/Marvell PXA support 2011-12-05 09:30:27 +01:00
devices.c arm/mach-pxa: Initial Intel/Marvell PXA support 2011-12-05 09:30:27 +01:00
gpio.c arm/mach-pxa: Initial Intel/Marvell PXA support 2011-12-05 09:30:27 +01:00
mfp-pxa2xx.c arm/mach-pxa: Initial Intel/Marvell PXA support 2011-12-05 09:30:27 +01:00
speed-pxa27x.c Merge branch 'master' into next 2011-12-15 19:58:56 +01:00