path: root/virt
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-07 17:59:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-07 17:59:53 -0700
commit9affd6becbfb2c3f0d04e554bb87234761b37aba (patch)
treee0b4e09f8136a59eb4502f7462608e54cf06a88a /virt
parent9607a85b67a9714290a78c1a56630ab1c9fa2c23 (diff)
arm: fix mismerge of arch/arm/mach-omap2/timer.c
I badly screwed up the merge in commit 6fa52ed33bea ("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 ff931c821bab ("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>
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions