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

Merge branch 2.6.39-rc7 into usb-linus 



This was needed to resolve a conflict in:
	drivers/usb/host/isp1760-hcd.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parents 04aebcbb 693d92a1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment