leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f8635abd38
linux/arch/arm/mach-kirkwood
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-dnskw.c ARM: Kirkwood: Convert dnskw to pinctrl 2012-11-24 02:57:56 +00:00
board-dockstar.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-dreamplug.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-dt.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
board-goflexnet.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-ib62x0.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-iconnect.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-iomega_ix2_200.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-km_kirkwood.c ARM: Kirkwood: Convert km_kirkwood to pinctrl 2012-11-24 02:58:48 +00:00
board-lsxl.c ARM: arm-soc: Board updates for 3.8 2012-12-12 12:14:06 -08:00
board-mplcec4.c ARM: Kirkwood: remove kirkwood_ehci_init() from new boards 2012-11-24 03:58:12 +00:00
board-ns2.c ARM: Kirkwood: remove kirkwood_ehci_init() from new boards 2012-11-24 03:58:12 +00:00
board-nsa310.c ARM: Kirkwood: remove kirkwood_ehci_init() from new boards 2012-11-24 03:58:12 +00:00
board-openblocks_a6.c ARM: Kirkwood: Add support LED of OpenBlocks A6 2012-11-24 02:59:12 +00:00
board-ts219.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-usi_topkick.c ARM: Kirkwood: Use fixed-regulator instead of board gpio call 2013-01-06 17:53:10 +00: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
cpuidle.c ARM: Kirkwood: checkpatch cleanups 2012-11-19 03:53:54 +00:00
d2net_v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
db88f6281-bp-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
dockstar-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
guruplug-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
irq.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
Kconfig ARM: arm-soc: Updates for Marvell mvebu/kirkwood 2012-12-14 14:54:26 -08:00
lacie_v2-common.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
lacie_v2-common.h [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
Makefile ARM: kirkwood: Add Plat'Home OpenBlocks A6 support 2012-11-22 07:01:51 +00:00
Makefile.boot ARM: kirkwood: move new dtbs to common Makefile 2012-09-22 14:24:00 -07:00
mpp.c ARM: Kirkwood: checkpatch cleanups 2012-11-19 03:53:54 +00:00
mpp.h ARM: orion: Fix Orion5x GPIO regression from MPP cleanup 2012-02-09 16:16:31 -08:00
mv88f6281gtw_ge-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
netspace_v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
netxbig_v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
openrd-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pcie.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
rd88f6192-nas-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
rd88f6281-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
sheevaplug-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
t5325-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ts41x-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ts219-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
tsx1x-common.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
tsx1x-common.h