original_kernel/arch/arm/mach-mx25
Russell King 988addf82e Merge branch 'origin' into devel-stable
Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c
2010-03-08 20:21:04 +00:00
..
Kconfig mx25: move ARCH_MXC_IOMUX_V3 to the ARCH level 2010-02-24 10:45:21 +01:00
Makefile
Makefile.boot
clock.c Merge branch 'origin' into devel-stable 2010-03-08 20:21:04 +00:00
devices.c
devices.h
mach-mx25pdk.c Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master 2010-02-25 14:01:49 +01:00
mm.c