From patchwork Fri Aug 16 07:30:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 267562 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 67D0A2C0238 for ; Fri, 16 Aug 2013 17:31:19 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VAEUp-0005HR-3g; Fri, 16 Aug 2013 07:30:55 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VAEUi-0002Y1-C6; Fri, 16 Aug 2013 07:30:48 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VAEUS-0002Wv-Hi for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2013 07:30:36 +0000 Received: from c-50-131-214-131.hsd1.ca.comcast.net ([50.131.214.131] helo=localhost.localdomain) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1VAEU4-000MRJ-Fv; Fri, 16 Aug 2013 07:30:08 +0000 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 50.131.214.131 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+7B6o9kAR5jMOy7HVwJ9e3 Content-Disposition: inline MIME-Version: 1.0 X-Mailer: MIME::Lite 3.028 (F2.82; T1.35; A2.09; B3.13; Q3.13) Date: Fri, 16 Aug 2013 00:30:05 -0700 From: Tony Lindgren To: arm@kernel.org, Arnd Bergmann , Kevin Hilman , Olof Johansson Subject: [GIT PULL 1/2] usb phy nop rename for v3.12 merge window Message-Id: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130816_033032_691760_A5D7330B X-CRM114-Status: UNSURE ( 6.89 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.3 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.6 INVALID_MSGID Message-Id is not valid, according to RFC 2822 Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095: Linux 3.11-rc3 (2013-07-28 20:53:33 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.12/usb-signed for you to fetch changes up to 3fa4d7344be0afebd80382ffeea6b1787cccf971: usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv (2013-08-09 17:26:00 +0300) ---------------------------------------------------------------- USB nop phy rename via Felipe Balbi : Here's a pull request of one patch to avoid conflicts during the merge window. ---------------------------------------------------------------- Sebastian Andrzej Siewior (1): usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv arch/arm/mach-omap2/board-omap3beagle.c | 4 +- arch/arm/mach-omap2/board-omap3evm.c | 4 +- arch/arm/mach-omap2/board-omap3pandora.c | 2 +- arch/arm/mach-omap2/usb-host.c | 10 ++--- drivers/usb/dwc3/dwc3-exynos.c | 8 ++-- drivers/usb/dwc3/dwc3-pci.c | 8 ++-- drivers/usb/musb/am35x.c | 2 +- drivers/usb/musb/blackfin.c | 2 +- drivers/usb/musb/da8xx.c | 2 +- drivers/usb/musb/davinci.c | 2 +- drivers/usb/musb/musb_dsps.c | 2 +- drivers/usb/musb/tusb6010.c | 2 +- drivers/usb/phy/Makefile | 2 +- drivers/usb/phy/{phy-nop.c => phy-generic.c} | 44 +++++++++++----------- .../usb/{nop-usb-xceiv.h => usb_phy_gen_xceiv.h} | 4 +- 15 files changed, 49 insertions(+), 49 deletions(-) rename drivers/usb/phy/{phy-nop.c => phy-generic.c} (83%) rename include/linux/usb/{nop-usb-xceiv.h => usb_phy_gen_xceiv.h} (81%)