Linus Torvalds 9affd6becb arm: fix mismerge of arch/arm/mach-omap2/timer.c ... I badly screwed up the merge in commit 6fa52ed33b ("Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/.../arm-soc") by incorrectly taking the arch/arm/mach-omap2/* data fully from the merge target because the 'drivers-for-linus' branch seemed to be a proper superset of the duplicate ARM commits. That was bogus: commit ff931c821b ("ARM: OMAP: clocks: Delay clk inits atleast until slab is initialized") only existed in head, and the changes to arch/arm/mach-omap2/timer.c from that commit got list. Re-doing the merge more carefully, I do think this part was the only thing I screwed up. Knock wood. Reported-by: Tony Lindgren <tony@atomide.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Olof Johansson <olof@lixom.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2013-05-07 17:59:53 -07:00
..
boot	Moves xenvm to mach-virt.	2013-05-07 15:11:43 -07:00
common
configs
crypto
include	Moves xenvm to mach-virt.	2013-05-07 15:11:43 -07:00
kernel
kvm
lib
mach-at91
mach-bcm
mach-bcm2835
mach-clps711x
mach-cns3xxx
mach-davinci
mach-dove
mach-ebsa110
mach-ep93xx
mach-exynos	ARM: late Exynos multiplatform changes	2013-05-07 11:28:42 -07:00
mach-footbridge
mach-gemini
mach-highbank
mach-imx
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-kirkwood
mach-ks8695
mach-lpc32xx
mach-mmp
mach-msm	proc: Use PDE attribute setting accessor functions	2013-05-07 15:01:11 -04:00
mach-mv78xx0
mach-mvebu
mach-mxs
mach-netx
mach-nomadik
mach-omap1
mach-omap2	arm: fix mismerge of arch/arm/mach-omap2/timer.c	2013-05-07 17:59:53 -07:00
mach-orion5x
mach-picoxcell
mach-prima2
mach-pxa
mach-realview
mach-rpc
mach-s3c24xx
mach-s3c64xx
mach-s5p64x0
mach-s5pc100
mach-s5pv210
mach-sa1100
mach-shark
mach-shmobile
mach-socfpga
mach-spear
mach-sunxi
mach-tegra
mach-u300
mach-ux500
mach-versatile
mach-vexpress	Moves xenvm to mach-virt.	2013-05-07 15:11:43 -07:00
mach-virt	Moves xenvm to mach-virt.	2013-05-07 15:11:43 -07:00
mach-vt8500
mach-w90x900
mach-zynq
mm
net
nwfpe
oprofile
plat-iop
plat-omap
plat-orion
plat-pxa
plat-samsung	ARM: late Exynos multiplatform changes	2013-05-07 11:28:42 -07:00
plat-versatile
tools
vfp
xen
Kconfig	Moves xenvm to mach-virt.	2013-05-07 15:11:43 -07:00
Kconfig-nommu
Kconfig.debug
Makefile