Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 21:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
6e7f7cfce2
linux/arch/arm/mach-orion5x
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 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 arm: plat-orion: use void __iomem pointers for addr-map functions 2012-09-21 18:04:47 +00:00
board-dt.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
d2net-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
db88f5281-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
dns323-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
edmini_v2-setup.c arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree 2012-11-21 21:00:51 +00: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: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree 2012-11-21 21:00:51 +00:00
kurobox_pro-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ls_hgl-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ls-chl-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
lsmini-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Makefile arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree 2012-11-21 21:00:51 +00: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: orion5x: Fix GPIO enable bits for MPP9 2012-05-08 18:57:21 +00:00
mss2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mv2120-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
net2big-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pci.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
rd88f5181l-fxo-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
rd88f5181l-ge-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
rd88f5182-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
rd88f6183ap-ge-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
terastation_pro2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ts78xx-fpga.h ARM: orion5x: ts78xx whitespace cleanups 2012-05-14 18:13:00 +02:00
ts78xx-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ts209-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ts409-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
tsx09-common.c ARM: orion5x: clean-up mach/io.h 2012-03-06 21:34:40 -06:00
tsx09-common.h
wnr854t-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
wrt350n-v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00