| commit | 2bcb132c693566bcb8208cc7ce66b72a4f852ecf | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Sep 16 20:42:46 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Sep 16 20:42:46 2012 -0700 |
| tree | 6fc4f05ce18140d86aa78a10380a610734aeaef9 | |
| parent | 67e6da702753dac8f0540209dded80a0c4e60d81 [diff] | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 [diff] |
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>