kernel-ark/arch/blackfin
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
..
boot Kbuild: centralize MKIMAGE and cmd_uimage definitions 2012-03-26 15:49:20 +02:00
configs arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
include Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal 2012-12-20 18:05:28 -08:00
kernel time: convert arch_gettimeoffset to a pointer 2012-12-24 09:36:07 -07:00
lib blackfin: license: Change ADI BSD license 2012-05-21 14:54:30 +08:00
mach-bf518 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf527 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf533 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf537 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf538 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf548 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf561 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf609 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin 2012-12-18 10:54:27 -08:00
mach-common ARCH: drivers remove __dev* attributes. 2013-01-03 15:57:13 -08:00
mm treewide: fix printk typo in multiple drivers 2012-11-19 11:08:17 +01:00
oprofile Blackfin arch: Clean oprofile build path for blackfin 2009-01-07 23:14:38 +08:00
Clear_BSD.txt blackfin: license: Change ADI BSD license 2012-05-21 14:54:30 +08:00
Kconfig Bury the conditionals from kernel_thread/kernel_execve series 2012-12-19 18:07:38 -05:00
Kconfig.debug blackfin: bf60x: pm: Add a debug option to calculate kernel wakeup time. 2012-05-21 14:54:52 +08:00
Makefile kbuild: add symbol prefix arg to kallsyms 2012-09-11 10:25:12 +08:00