From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 17 Nov 2012 02:46:21 +0000 (-0800)
Subject: Merge 3.7-rc6 into usb-next.
X-Git-Tag: firefly_0821_release~3680^2~1517^2~38
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0c864d8b3e51bd61f43484268c9aa4eb9a199b02;p=firefly-linux-kernel-4.4.55.git

Merge 3.7-rc6 into usb-next.

This resolves a conflict with these files:
	drivers/usb/early/ehci-dbgp.c
	drivers/usb/host/ehci-ls1x.c
	drivers/usb/host/ohci-xls.c
	drivers/usb/musb/ux500.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

0c864d8b3e51bd61f43484268c9aa4eb9a199b02