tree 8e788d9ff4bacd907ba3df176eb67e87ff5c3dde
parent fea67d3dfd13bcca4daa62cbafe6f8eb99523217
parent 3fa4d7344be0afebd80382ffeea6b1787cccf971
author Kevin Hilman <khilman@linaro.org> 1376932708 -0700
committer Kevin Hilman <khilman@linaro.org> 1376932758 -0700
mergetag object 3fa4d7344be0afebd80382ffeea6b1787cccf971
 type commit
 tag omap-for-v3.12/usb-signed
 tagger Tony Lindgren <tony@atomide.com> 1376469453 -0700
 
 USB nop phy rename via Felipe Balbi <balbi@ti.com>:
 
 Here's a pull request of one patch to avoid conflicts during the merge
 window.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJSC0ITAAoJEBvUPslcq6Vz3UIP/iv4OtCkA3hqbHRYKIzaKPas
 JGJSyMqWDPXWBn2hPVLFu1O0MR+S5NIXp5VMHTVxu9sT5m+QKatKu3Rx18t8+KED
 KkQFStVFapELwv5AHnOnKk4KoN1ytmVHQAqMRBGoi81GSaDPzPez/2KI1D8Epz2H
 wbrhm1BbJGkheU0kToBgww0nCOF5F12w3B0n87schihZ76k8ltymWQOlgWDwR7FE
 1kpftwaJds1IC5dWVJhKSdH0F0/Y0bvwuxtDm/tgkWX3y+6f5Nl7+7tk98KM7FMz
 i+7W4bjGnfbOORy98tMOUf+Auf3Zev42aYlrr65AnSD8u+R2P6uO7Hn/JfyQMnrh
 d/8SBClNlMRAgKoiDMJCAad4CprT/uCeSdLajE3YU6vQPKKmF38zSsRoY2yEocKr
 8wUSihETkrIW/FhajvZsvSoxWFG5eC3hYwprS8lhcjf+4neNDKwD7baSw0Sf+O5z
 3tiLTkvlP4fGz4zMoNPfz7LZMROKpd86vD1VsJWKpY55/d7i7cGliEHUF0S2PdzI
 LCIdOyageD6uie5/fUsaNEsE9lb959VVIYxb/LRXCUtV9mmIp9hxd4+UQYb8aa8s
 qtBIr9+dAIBKE/oo5O9UVkyZe5nvxwhKEkkYr96xWzbL0Ub5KwjKEmhsnOo9sWPD
 XjpBTEymS0Kq7izXWmQL
 =2mCp
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.12/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

From Tony Lindgren:
USB nop phy rename via Felipe Balbi <balbi@ti.com>:

Here's a pull request of one patch to avoid conflicts during the merge
window.

* tag 'omap-for-v3.12/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv

Signed-off-by: Kevin Hilman <khilman@linaro.org>