diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-05-07 14:46:50 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-05-07 14:47:17 +0200 |
| commit | 0592c2189ece16f3e0c5a56245634aba93d0c9dd (patch) | |
| tree | 52bc86123e282349f637ef1757b1e44618b479bd /arch/arm/mach-omap2/common.c | |
| parent | 442a33ebce9e02a2dd6662f16c9f2aad834d0115 (diff) | |
| parent | 08a48be32ff31d38bcfec7d210c954cb62fd5cd7 (diff) | |
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>
Diffstat (limited to 'arch/arm/mach-omap2/common.c')
0 files changed, 0 insertions, 0 deletions