torvalds-linux/arch/m68k
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
..
amiga m68k: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07:00
apollo m68k: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07:00
atari m68k: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07:00
bvme6000 m68k: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07:00
configs
emu ARCH: drivers remove __dev* attributes. 2013-01-03 15:57:13 -08:00
fpsp040
hp300 m68k: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07:00
ifpsp060
include Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
kernel Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
lib
mac m68k: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07:00
math-emu
mm
mvme16x m68k: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07:00
mvme147 m68k: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07:00
platform
q40 m68k: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07:00
sun3 m68k: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07:00
sun3x m68k: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07:00
tools/amiga
install.sh
Kconfig
Kconfig.bus
Kconfig.cpu
Kconfig.debug
Kconfig.devices
Kconfig.machine
Makefile