From: Arnd Bergmann Date: Tue, 7 May 2013 12:46:50 +0000 (+0200) Subject: Merge tag 'omap-for-v3.10/fixes-for-merge-window' of git://git.kernel.org/pub/scm... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0592c2189ece16f3e0c5a56245634aba93d0c9dd;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge tag 'omap-for-v3.10/fixes-for-merge-window' of git://git./linux/kernel/git/tmlind/linux-omap into late/cleanup From Tony Lindgren : An urgent fix for a timer mismerge for and a regression fix for musb device naming change. * tag 'omap-for-v3.10/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP4: change the device names in usb_bind_phy ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a Signed-off-by: Arnd Bergmann --- 0592c2189ece16f3e0c5a56245634aba93d0c9dd