original_kernel/arch/arm/plat-pxa
Russell King ac1d426e82 Merge branch 'devel-stable' into devel
Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/system.h
	arch/arm/mm/Kconfig
2010-05-17 17:24:04 +01:00
..
include/plat
Kconfig
Makefile Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
dma.c
gpio.c
mfp.c
pmu.c
pwm.c
ssp.c