| commit | e765bf84d59257d3c4f948fbce426ea3565e83ad | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Thu Jul 05 08:57:24 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Thu Jul 05 08:58:03 2012 -0700 |
| tree | e6c2fa13b21a2faf398c3c6ceba8fe5187e381d7 | |
| parent | afd6bb387323154ff6554b52d333ec6efb8efe61 [diff] | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 [diff] |
Merge 3.5-rc5 into usb-next This resolves a merge issue with the option.c USB serial driver. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>