Skip to content
Commit 69b7290e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18-rc4 into usb-next. 



This resolves a conflict in drivers/usb/host/Kconfig

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 35a27eab 206c5f60
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment