Skip to content
Snippets Groups Projects
Commit 2bcb132c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 67e6da70 5698bd75
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 198 additions and 21 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment