| commit | 9e5f9c8aa85da01a7474655dc6af43b5985ad56a | [log] [tgz] |
|---|---|---|
| author | Felipe Balbi <balbi@ti.com> | Fri Aug 09 17:31:23 2013 +0300 |
| committer | Felipe Balbi <balbi@ti.com> | Fri Aug 09 17:31:23 2013 +0300 |
| tree | 15ceace09b484a2b351bd26587784cc169a702f0 | |
| parent | d07f4a8200cfc7ff2ba23ef87dd6267a4d70fb10 [diff] | |
| parent | 3fa4d7344be0afebd80382ffeea6b1787cccf971 [diff] |
Merge branch 'nop-phy-rename' into next Signed-off-by: Felipe Balbi <balbi@ti.com> Conflicts: drivers/usb/phy/phy-generic.c