| commit | 69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Nov 10 12:10:24 2014 +0900 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Nov 10 12:10:24 2014 +0900 |
| tree | f4ad376b3aaf2b68e9066df3885ee8dd297251cb | |
| parent | 35a27eab6f94e15fa30f7662af00fbec50526f4a [diff] | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 [diff] |
Merge 3.18-rc4 into usb-next. This resolves a conflict in drivers/usb/host/Kconfig Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>