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
..
bindings	Merge 3.6-rc6 into usb-next	2012-09-16 20:42:46 -07:00
00-INDEX	Documentation: add devicetree docs index file	2011-03-16 10:47:03 -07:00
booting-without-of.txt	dt/documentation: Fix value format description	2012-05-19 15:03:28 -06:00
usage-model.txt	usage-model.txt: fix typo machine_init->init_machine	2012-07-06 07:16:33 -05:00