Merge tag 'omap-for-v3.9-rc6/fixes-signed' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Sat, 27 Apr 2013 00:35:13 +0000 (17:35 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 27 Apr 2013 00:35:21 +0000 (17:35 -0700)
commitd21be237ffa357e55005e2bf9ffef10b23c184d0
treea3f81bbdeb9c384a306cfeecfa5567186a4d2a28
parent73053d973dd6f56472309cffa5a5d15a62dd6f96
parentf4d7a536faa43f30d87f701268db76b8433a2a8b
Merge tag 'omap-for-v3.9-rc6/fixes-signed' of git://git./linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:
One MUSB regression fix that I forgot to send earlier. Without
this MUSB no longer works on omap4 based devices.

* tag 'omap-for-v3.9-rc6/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock

Signed-off-by: Olof Johansson <olof@lixom.net>