leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9cb0d1babf
linux/arch/arm/mach-mmp
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: delete struct sys_timer 2012-12-24 09:36:38 -07:00
aspenite.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
avengers_lite.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
brownstone.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
clock-mmp2.c ARM: mmp: move mmp2 clock definition to separated file 2012-09-08 23:38:19 +08:00
clock-pxa168.c arm: mmp: move pxa168 clock definition to separated file 2012-09-08 23:37:16 +08:00
clock-pxa910.c arm: mmp: move pxa910 clock definition to separated file 2012-09-08 23:37:51 +08:00
clock.c ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
clock.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
common.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
common.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
devices.c ARM: mmp: add usb host support for PXA168 2012-05-03 15:06:05 +08:00
flint.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
gplugd.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
irq.c ARM: mmp: using for_each_set_bit to simplify the code 2012-09-21 15:57:31 +08:00
jasper.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Kconfig ARM: mmp: select pinctrl driver 2012-11-21 13:18:04 +08:00
Makefile ARM: mmp: move mmp2 clock definition to separated file 2012-09-08 23:38:19 +08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mmp2-dt.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mmp2.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mmp-dt.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pm-mmp2.c ARM: mmp: add PM support for mmp2 2012-05-07 11:35:00 +08:00
pm-pxa910.c ARM: mmp: add pm support for pxa910 2012-05-07 11:48:37 +08:00
pxa168.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pxa910.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
sram.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
tavorevb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
teton_bga.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
time.c ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
ttc_dkb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00