android_kernel_samsung_msm8976/arch/arm/mach-lpc32xx
Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup
Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-exynos/cpu.c
	arch/arm/mach-shmobile/board-kota2.c

This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-07 11:51:28 +00:00
..
include/mach Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
clock.c arm: lpc32xx: add tsc-device 2011-07-12 10:57:13 +02:00
clock.h ARM: LPC32XX: Clock driver 2010-07-27 03:08:09 -07:00
common.c ARM: restart: lpc32xx & u300: remove unnecessary printk 2012-01-05 12:57:21 +00:00
common.h ARM: restart: lpc32xx: use new restart hook 2012-01-05 12:57:15 +00:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
Kconfig ARM: LPC32XX: Arch config menu supoport and makefiles 2010-07-27 08:46:22 -07:00
Makefile ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem 2011-08-22 09:13:21 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
phy3250.c ARM: restart: lpc32xx: use new restart hook 2012-01-05 12:57:15 +00:00
pm.c Fix common misspellings 2011-03-31 11:26:23 -03:00
serial.c ARM: LPC32XX: Serial support code 2010-07-27 08:42:07 -07:00
suspend.S ARM: LPC32XX: System suspend support 2010-07-27 08:35:56 -07:00
timer.c clocksource: convert ARM 32-bit up counting clocksources 2011-05-23 18:04:51 +01:00