commit | b472b8e22f9f9bc88dc73017d61609684289fb13 | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Oct 29 09:04:39 2012 -0700 |
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Oct 29 09:04:39 2012 -0700 |
tree | cbb2ec0c2fd2cf6d9f4d2e323e97aa757bd93c59 | |
parent | d124a60dbbe7c12f3871e2c7fc71f98a821ee9a8 [diff] | |
parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 [diff] |
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>