FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-27 20:07:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8d84981e39
linux/arch/arm/mach-netx
History
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 ARM: netx: move platform_data definitions 2012-09-14 11:17:36 +02:00
fb.c arch/arm/mach-netx/fb.c: reuse dummy clk routines for CONFIG_HAVE_CLK=n 2012-07-30 17:25:13 -07:00
fb.h
generic.c ARM: __io abuse cleanup 2012-03-13 21:25:21 -05:00
generic.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Kconfig
Makefile
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
nxdb500.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
nxdkn.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
nxeb500hmi.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pfifo.c
time.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
xc.c treewide: Fix typos in various drivers 2012-12-03 11:05:04 +01:00