android_kernel_asus_sm8350/arch/arm/mach-integrator
Russell King b0df898680 Merge branch 'devel-stable' into for-linus
Conflicts:
	arch/arm/Kconfig.debug
	arch/arm/plat-versatile/Kconfig
Merge fixes:
	arch/arm/mach-integrator/Kconfig
	drivers/clocksource/Kconfig
2012-03-27 11:30:31 +01:00
..
include/mach Merge branch 'devel-stable' into for-linus 2012-03-27 11:30:31 +01:00
common.h ARM: restart: integrator: use new restart hook 2012-01-05 12:57:13 +00:00
core.c Merge branch 'devel-stable' into for-linus 2012-03-27 11:30:31 +01:00
cpu.c ARM: integrator: fix compile warning in cpu.c 2011-01-11 13:48:17 +00:00
impd1.c ARM: amba: integrator: convert to use amba_device_alloc 2012-01-25 11:02:02 +00:00
integrator_ap.c ARM: 7349/1: integrator: convert to sparse irqs 2012-03-24 09:38:56 +00:00
integrator_cp.c Merge branch 'devel-stable' into for-linus 2012-03-27 11:30:31 +01:00
Kconfig ARM: 7310/1: integrator: implement sched_clock across all boards 2012-03-24 09:38:51 +00:00
leds.c ARM: Fix Versatile&Integrator includes to behave in the same way as Realview 2010-04-29 18:04:15 +01:00
lm.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
Makefile ARM: Realview/Versatile/Integrator: separate out common clock code 2010-05-02 09:35:33 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pci_v3.c ARM: 7349/1: integrator: convert to sparse irqs 2012-03-24 09:38:56 +00:00
pci.c ARM: 7349/1: integrator: convert to sparse irqs 2012-03-24 09:38:56 +00:00