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

Merge 3.5-rc7 into usb-next 



This resolves the merge issue with the drivers/usb/host/ehci-omap.c
file.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 84a1caf1 1a49e2ac
Expand all 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