| commit | 19915e623458004547c1c2490b09bb923fe69337 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jun 08 10:57:51 2015 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jun 08 10:57:51 2015 -0700 |
| tree | b794a81ddf083ed08a5bb32820c2dd0121ed74b2 | |
| parent | 4e47dcf78d2fa0b6316b6d563a055fdcc93bd222 [diff] | |
| parent | d4a4f75cd8f29cd9464a5a32e9224a91571d6649 [diff] |
Merge 4.1-rc7 into usb-next This resolves a merge issue in musb_core.c and we want the fixes that were in Linus's tree in this branch as well for testing. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>