Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
8d84981e39
linux/arch/arm
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
..
boot ARM: arm-soc fixes for 3.8-rc 2013-01-08 18:53:56 -08:00
common Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 2013-01-09 08:58:57 -08:00
configs arm: mvebu: Use dw-apb-uart instead of ns16650 as UART driver 2013-01-06 17:41:14 +00:00
crypto
include ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
kernel Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
lib ARM: export default read_current_timer 2012-10-09 20:24:36 +02:00
mach-at91 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-bcm ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-bcm2835 ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-clps711x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-cns3xxx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-davinci Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-dove Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-ebsa110 ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-ep93xx ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-exynos Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-footbridge Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-gemini ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-h720x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-highbank Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-imx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-integrator ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-iop13xx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-iop32x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-iop33x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-ixp4xx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-kirkwood Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-ks8695 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-l7200/include/mach
mach-lpc32xx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-mmp Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-msm Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-mv78xx0 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-mvebu ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mxs Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-netx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-nomadik Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-omap1 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-omap2 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-orion5x Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-picoxcell ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-prima2 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-pxa Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-realview ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-rpc ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-s3c24xx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-s3c64xx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-s3c2410
mach-s3c2412 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s3c2440 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s5p64x0 ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-s5pc100 ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-s5pv210 ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-sa1100 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-shark ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-shmobile ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-socfpga ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-spear3xx ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-spear6xx ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-spear13xx ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-sunxi Merge branch 'timer/cleanup' into next/cleanup 2013-01-08 10:51:19 -08:00
mach-tegra Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-u300 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-ux500 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-versatile Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-vexpress Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-vt8500 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-w90x900 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-zynq ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mm ARM: 7616/1: cache-l2x0: aurora: Use writel_relaxed instead of writel 2013-01-07 15:04:17 +00:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-12-12 18:07:07 -08:00
nwfpe
oprofile
plat-iop ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
plat-omap ARM: arm-soc fixes for 3.8-rc 2013-01-08 18:53:56 -08:00
plat-orion ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
plat-pxa ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
plat-s3c24xx Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-12-13 12:00:02 -08:00
plat-samsung Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
plat-spear ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
plat-versatile ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
tools ARM: boot: Fix usage of kecho 2012-11-12 23:22:54 +01:00
vfp ARM: 7566/1: vfp: fix save and restore when running on pre-VFPv3 and CONFIG_VFPv3 set 2012-10-29 10:04:05 +00:00
xen Features: 2012-12-13 14:29:16 -08:00
Kconfig Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 2013-01-09 08:58:57 -08:00
Kconfig-nommu
Kconfig.debug ARM: arm-soc: multiplatform conversion patches 2012-12-13 10:57:16 -08:00
Makefile ARM: arm-soc: multiplatform conversion patches 2012-12-13 10:57:16 -08:00