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

Merge 3.4-rc6 into usb-next 



This resolves the conflict with:
	drivers/usb/host/ehci-tegra.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 3aa2ae74 d48b97b4
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