iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Vaibhav Hiremath 626479696d ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a 
Looks like the timer.c fixes in commit ff931c82 (ARM: OMAP: clocks:
Delay clk inits atleast until slab is initialized) got lost in a
merge with da4a686a (ARM: smp_twd: convert to use CLKSRC_OF init).

Without the omap_clk_init() calls none of OMAP family of devices
boot.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
[tony@atomide.com: updated comments to describe merge error]
Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-05-06 16:39:16 -07:00
..
boot
Clean-up for omap2+ timers from Jon Hunter <jon-hunter@ti.com>:
2013-04-08 19:30:48 +02:00
common
ARM: GIC: fix GIC cpumask initialization
2013-02-08 10:17:22 +00:00
configs
Fix few regressions, omap3 pm init with device tree, and some
2013-03-05 23:22:00 +01:00
crypto
ARM: 7626/1: arm/crypto: Make asm SHA-1 and AES code Thumb-2 compatible
2013-01-13 12:41:22 +00:00
include
Merge branch 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx into next/drivers
2013-04-08 18:34:19 +02:00
kernel
Clean-up for omap2+ timers from Jon Hunter <jon-hunter@ti.com>:
2013-04-08 19:30:48 +02:00
kvm
ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot
2013-02-25 11:48:41 +02:00
lib
ARM: 7670/1: fix the memset fix
2013-03-12 12:18:47 +00:00
mach-at91
arm: vt8500: Add pinctrl driver for arch-vt8500
2013-04-08 18:26:15 +02:00
mach-bcm
Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc
2013-01-24 17:57:20 +09:00
mach-bcm2835
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
mach-clps711x
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
2013-02-05 10:26:20 -08:00
mach-cns3xxx
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
2013-02-05 10:26:20 -08:00
mach-davinci
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-dove
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-ebsa110
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
2013-02-05 10:26:20 -08:00
mach-ep93xx
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
2013-02-05 10:26:20 -08:00
mach-exynos
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-footbridge
ARM: fix CONFIG_VIRT_TO_BUS handling
2013-03-18 13:49:57 +00:00
mach-gemini
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
2013-02-05 10:26:20 -08:00
mach-h720x
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
2013-02-05 10:26:20 -08:00
mach-highbank
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-imx
Merge branch 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx into next/drivers
2013-04-08 18:34:19 +02:00
mach-integrator
Merge commit '7185684' into omap-for-v3.10/timer
2013-04-03 10:32:47 -07:00
mach-iop13xx
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-iop32x
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
2013-02-05 10:26:20 -08:00
mach-iop33x
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
2013-02-05 10:26:20 -08:00
mach-ixp4xx
ARM: w1-gpio: fix erroneous gpio requests
2013-03-12 16:20:45 -07:00
mach-kirkwood
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-ks8695
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-l7200/include/mach
…
mach-lpc32xx
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
2013-02-05 10:26:20 -08:00
mach-mmp
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-msm
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-mv78xx0
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-mvebu
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-mxs
ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0
2013-03-19 11:07:58 +08:00
mach-netx
ARM: 7642/1: netx: bump IRQ offset to 64
2013-03-03 22:54:11 +00:00
mach-nomadik
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-omap1
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-omap2
ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
2013-05-06 16:39:16 -07:00
mach-orion5x
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-picoxcell
Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc
2013-01-24 17:57:20 +09:00
mach-prima2
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-pxa
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-realview
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-rpc
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
2013-02-05 10:26:20 -08:00
mach-s3c24xx
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-s3c64xx
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-s5p64x0
ARM: SAMSUNG: Rename s5p-time to samsung-time
2013-03-05 20:15:55 +09:00
mach-s5pc100
ARM: S5PC100: Add samsung-time support for s5pc100
2013-03-05 20:19:54 +09:00
mach-s5pv210
arm: vt8500: Add pinctrl driver for arch-vt8500
2013-04-08 18:26:15 +02:00
mach-sa1100
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-shark
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
2013-02-05 10:26:20 -08:00
mach-shmobile
arm: vt8500: Add pinctrl driver for arch-vt8500
2013-04-08 18:26:15 +02:00
mach-socfpga
Merge branch 'socfpga/hw' into next/soc
2013-02-11 19:37:51 -08:00
mach-spear3xx
ARM: spear3xx: Use correct pl080 header file
2013-03-12 10:56:32 +01:00
mach-spear6xx
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
mach-spear13xx
ARM: smp_twd: convert to use CLKSRC_OF init
2013-03-11 08:42:08 -05:00
mach-sunxi
Merge branch 'timer/cleanup' into late/mvebu2
2013-02-28 18:54:15 +01:00
mach-tegra
Merge commit '7185684' into omap-for-v3.10/timer
2013-04-03 10:32:47 -07:00
mach-u300
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-ux500
Clean-up for omap2+ timers from Jon Hunter <jon-hunter@ti.com>:
2013-04-08 19:30:48 +02:00
mach-versatile
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-vexpress
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
mach-virt
ARM: mach-virt: fixup machine descriptor after removal of sys_timer
2013-02-11 10:39:30 -08:00
mach-vt8500
pinctrl: gpio: vt8500: Add pincontrol driver for arch-vt8500
2013-04-04 18:00:02 +13:00
mach-w90x900
arm-soc: cleanups
2013-02-21 14:58:40 -08:00
mach-zynq
arm: zynq: Move timer to generic location
2013-04-04 09:22:09 +02:00
mm
Merge branch 'fixes-for-3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2013-03-15 17:35:03 -07:00
net
ARM:net: an issue for k which is u32, never < 0
2013-03-12 11:33:05 -04:00
nwfpe
…
oprofile
…
plat-iop
ARM: use clockevents_config_and_register() where possible
2013-01-14 10:12:42 -08:00
plat-omap
Merge commit '7185684' into omap-for-v3.10/timer
2013-04-03 10:32:47 -07:00
plat-orion
arm: plat-orion: fix address decoding when > 4GB is used
2013-03-08 22:07:19 +00:00
plat-pxa
ARM: drivers: remove __dev* attributes.
2013-01-03 15:57:04 -08:00
plat-samsung
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
2013-04-01 13:47:29 -05:00
plat-spear
ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ"
2013-03-05 23:30:24 +01:00
plat-versatile
Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into kvm-arm/timer
2013-02-11 19:03:52 +00:00
tools
…
vfp
ARM: Fix broken commit 0cc41e4a21d43 corrupting kernel messages
2013-03-01 21:09:59 +00:00
xen
xen: implement updated XENMEM_add_to_physmap_range ABI
2013-02-19 22:01:55 -05:00
Kconfig
Merge branch 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx into next/drivers
2013-04-08 18:34:19 +02:00
Kconfig-nommu
…
Kconfig.debug
ARM: imx: add dependency check for DEBUG_IMX_UART_PORT
2013-03-19 13:56:05 +08:00
Makefile
arm-soc: virtualization changes
2013-02-21 15:40:16 -08:00