| commit | 4cbbd1d55dd9375a455d12fc7e844809fbb795c0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Apr 27 13:58:36 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Apr 27 13:58:36 2013 -0700 |
| tree | 085772135fa051bf9fcec03e7164a68b0943af98 | |
| parent | 3c0b9de6d37a481673e81001c57ca0e410c72346 [diff] | |
| parent | d21be237ffa357e55005e2bf9ffef10b23c184d0 [diff] |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fix from Olof Johansson: "A late-arriving fix for musb on OMAP4, resolving an issue where the musb IP won't be clocked and thus not functional. Small in scope, most of the lines changed is a longish comment." * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock