]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fea67d3 3fa4d73)
Merge tag 'omap-for-v3.12/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel...
authorKevin Hilman <khilman@linaro.org>
Mon, 19 Aug 2013 17:18:28 +0000 (10:18 -0700)
committerKevin Hilman <khilman@linaro.org>
Mon, 19 Aug 2013 17:19:18 +0000 (10:19 -0700)
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>
1  2 
drivers/usb/musb/tusb6010.c patch | diff1 | diff2 | blob | history

diff --cc drivers/usb/musb/tusb6010.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.