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	Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood	2012-09-22 14:22:47 -07:00
addr-map.c	Merge branch 'late/fixes' into fixes	2012-10-07 07:22:32 -07:00
buffalo-wxl-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
common.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
common.h	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
db78x00-bp-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
irq.c	Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood	2012-09-22 14:22:47 -07:00
Kconfig	[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)	2010-02-23 17:10:08 -05:00
Makefile	[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)	2010-02-23 17:10:08 -05:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mpp.c	arm: plat-orion: use void __iomem pointers for MPP functions	2012-09-21 18:04:24 +00:00
mpp.h	ARM: orion: Fix Orion5x GPIO regression from MPP cleanup	2012-02-09 16:16:31 -08:00
pcie.c	ARM: drivers: remove __dev* attributes.	2013-01-03 15:57:04 -08:00
rd78x00-masa-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00