Greg Kroah-Hartman 2bcb132c69 Merge 3.6-rc6 into usb-next
This resolves the merge problems with:
	drivers/usb/dwc3/gadget.c
	drivers/usb/musb/tusb6010.c
that had been seen in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-16 20:42:46 -07:00
..
2011-11-07 21:10:47 -05:00
2012-04-25 13:01:40 +02:00
2012-09-10 11:10:37 -07:00
2012-07-02 23:11:14 +03:00