From: Kevin Hilman Date: Mon, 19 Aug 2013 17:18:28 +0000 (-0700) Subject: Merge tag 'omap-for-v3.12/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=47aad66c2659b8985512b66f87bb5fe7bdc88dff;p=linux-beck.git 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 : 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 --- 47aad66c2659b8985512b66f87bb5fe7bdc88dff