diff options
| author | 2013-08-09 17:31:23 +0300 | |
|---|---|---|
| committer | 2013-08-09 17:31:23 +0300 | |
| commit | 9e5f9c8aa85da01a7474655dc6af43b5985ad56a (patch) | |
| tree | 15ceace09b484a2b351bd26587784cc169a702f0 /tools/lib/python/kdoc/python_version.py | |
| parent | usb: phy: mv-usb: remove incorrect __exit_p annotation (diff) | |
| parent | usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv (diff) | |
Merge branch 'nop-phy-rename' into next
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/phy/phy-generic.c
Diffstat (limited to 'tools/lib/python/kdoc/python_version.py')
0 files changed, 0 insertions, 0 deletions
