tmp_suning_uos_patched/arch/arm/mach-vexpress
Russell King 4073723acb Merge branch 'misc' into devel
Conflicts:
	arch/arm/Kconfig
	arch/arm/common/Makefile
	arch/arm/kernel/Makefile
	arch/arm/kernel/smp.c
2011-01-06 22:32:52 +00:00
..
include/mach Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
core.h
ct-ca9x4.c Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
headsmp.S
hotplug.c
Kconfig
localtimer.c
Makefile
Makefile.boot
platsmp.c Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
v2m.c Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00