diff options
| author |   Kevin Hilman <khilman@linaro.org> | 2013-08-19 10:18:28 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-19 10:19:18 -0700 |
| commit | 47aad66c2659b8985512b66f87bb5fe7bdc88dff (patch) | |
| tree | 8e788d9ff4bacd907ba3df176eb67e87ff5c3dde /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'soc-3.12' of git://git.infradead.org/linux-mvebu into next/cleanup (diff) | |
| parent | usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv (diff) | |
| download | wireguard-linux-47aad66c2659b8985512b66f87bb5fe7bdc88dff.tar.xz wireguard-linux-47aad66c2659b8985512b66f87bb5fe7bdc88dff.zip | |
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>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions