kernel-fxtec-pro1x/arch/arm/mach-s5pv210
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
..
include/mach
clock.c
cpu.c
init.c
Kconfig
mach-smdkc110.c
mach-smdkv210.c
Makefile
Makefile.boot