Linus Torvalds 770e1b035d Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm ... * 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (207 commits) ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h ARM: 7269/1: mach-sa1100: fix sched_clock breakage ARM: 7198/1: arm/imx6: add restart support for imx6q ARM: restart: remove the now empty arch_reset() ARM: restart: remove comments about adding code to arch_reset() ARM: restart: lpc32xx & u300: remove unnecessary printk ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook ARM: restart: w90x900: use new restart hook ARM: restart: Versatile Express: use new restart hook ARM: restart: versatile: use new restart hook ARM: restart: u300: use new restart hook ARM: restart: tegra: use new restart hook ARM: restart: spear: use new restart hook ARM: restart: shark: use new restart hook ARM: restart: sa1100: use new restart hook ARM: 7252/1: restart: S5PV210: use new restart hook ARM: 7251/1: restart: S5PC100: use new restart hook ARM: 7250/1: restart: S5P64X0: use new restart hook ARM: 7266/1: restart: S3C64XX: use new restart hook ARM: 7265/1: restart: S3C24XX: use new restart hook ... Fix up trivial conflict in arch/arm/mm/init.c due to removal of memblock_init() clashing with the movement of the sorting of the meminfo array.		2012-01-06 18:15:25 -08:00
..
acpi_pm.c	time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver	2011-11-21 19:00:58 -08:00
clksrc-dbx500-prcmu.c	ARM: 7261/1: clocksource/ux500-prcmu: fix sched_clock breakage	2012-01-03 15:17:56 +00:00
cs5535-clockevt.c
cyclone.c
dw_apb_timer.c	dw_apb_timer: constify clocksource name	2011-10-04 13:08:18 -07:00
i8253.c	time: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver	2011-11-21 19:00:59 -08:00
Kconfig	clocksource: add DBX500 PRCMU Timer support	2011-09-22 15:42:57 +02:00
Makefile	clocksource: add DBX500 PRCMU Timer support	2011-09-22 15:42:57 +02:00
mmio.c
scx200_hrt.c
sh_cmt.c	drivers/clocksource: Add module.h to those who were using it implicitly	2011-10-31 19:31:42 -04:00
sh_mtu2.c	drivers/clocksource: Add module.h to those who were using it implicitly	2011-10-31 19:31:42 -04:00
sh_tmu.c	drivers/clocksource: Add module.h to those who were using it implicitly	2011-10-31 19:31:42 -04:00
tcb_clksrc.c	clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz	2011-11-21 19:01:42 -08:00