Olof Johansson 8d84981e39 Merge branch 'clocksource/cleanup' into next/cleanup ... Clockevent cleanup series from Shawn Guo. Resolved move/change conflict in mach-pxa/time.c due to the sys_timer cleanup. * clocksource/cleanup: clocksource: use clockevents_config_and_register() where possible ARM: use clockevents_config_and_register() where possible clockevents: export clockevents_config_and_register for module use + sync to Linux 3.8-rc3 Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: arch/arm/mach-pxa/time.c		2013-01-14 10:20:02 -08:00
..
include/mach	pinctrl/coh901: use irqdomain, allocate irqdescs	2012-11-11 19:06:02 +01:00
core.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
dma_channels.h	ARM: u300: move DMA channel header into mach-u300	2012-08-13 13:53:07 +02:00
dummyspichip.c	ARM: drivers: remove __dev* attributes.	2013-01-03 15:57:04 -08:00
i2c.c	MFD bits for the 3.7 merge window.	2012-10-05 12:01:30 +09:00
i2c.h
Kconfig	ARM: config: sort select statements alphanumerically	2012-10-13 17:11:28 +01:00
Makefile	ARM: u300: merge u300.c into core.c and rid headers	2012-08-13 13:53:06 +02:00
Makefile.boot
regulator.c
spi.c	ARM: u300: move DMA channel header into mach-u300	2012-08-13 13:53:07 +02:00
spi.h
timer.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
timer.h	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
u300-gpio.h	ARM: u300: retire ancient platforms	2012-08-13 13:53:04 +02:00