original_kernel/arch/arm/mach-mxc91231
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
Makefile
Makefile.boot
clock.c
crm_regs.h
devices.c
devices.h
iomux.c
magx-zn5.c
mm.c
system.c