]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'omap-for-v3.10/fixes-for-merge-window' of git://git.kernel.org/pub/scm...
authorArnd Bergmann <arnd@arndb.de>
Tue, 7 May 2013 12:46:50 +0000 (14:46 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 7 May 2013 12:47:17 +0000 (14:47 +0200)
commit0592c2189ece16f3e0c5a56245634aba93d0c9dd
tree52bc86123e282349f637ef1757b1e44618b479bd
parent442a33ebce9e02a2dd6662f16c9f2aad834d0115
parent08a48be32ff31d38bcfec7d210c954cb62fd5cd7
Merge tag 'omap-for-v3.10/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into late/cleanup

From Tony Lindgren <tony@atomide.com>:

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 <arnd@arndb.de>
arch/arm/mach-omap2/board-4430sdp.c