From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 29 Oct 2012 16:04:39 +0000 (-0700)
Subject: Merge 3.7-rc3 into usb-next.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b472b8e22f9f9bc88dc73017d61609684289fb13;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge 3.7-rc3 into usb-next.

This pulls in all of the USB changes in 3.7-rc3 into usb-next and
resolves the merge issue with:
	drivers/usb/misc/ezusb.c

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

b472b8e22f9f9bc88dc73017d61609684289fb13
diff --cc drivers/usb/misc/ezusb.c
index 0a48de91df3a,6589268a6515..e712afed947c
--- a/drivers/usb/misc/ezusb.c
+++ b/drivers/usb/misc/ezusb.c
@@@ -162,4 -157,5 +162,6 @@@ int ezusb_fx2_ihex_firmware_download(st
  	return ezusb_ihex_firmware_download(dev, ezusb_fx2, firmware_path);
  }
  EXPORT_SYMBOL_GPL(ezusb_fx2_ihex_firmware_download);
 +#endif
+ 
+ MODULE_LICENSE("GPL");