commit | 99f14bd4d1b2a1b1b6cd508e08efdbc5e3919198 | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Dec 24 10:18:03 2013 -0800 |
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Dec 24 10:18:03 2013 -0800 |
tree | a81b9b315127132a84454746043c98990bcd56b9 | |
parent | 3482528e9aced9234d4e2a4a9538c882a9aa5aa2 [diff] | |
parent | 413541dd66d51f791a0b169d9b9014e4f56be13c [diff] |
Merge 3.13-rc5 into usb-next This resolves the merge issue with drivers/usb/host/ohci-at91.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>