Merge branch 2.6.39-rc7 into usb-linus
commit8a1629c771b1a60bc6d73394d869fe69b13200dc
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 10 May 2011 20:30:45 +0000 (10 13:30 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 10 May 2011 20:30:45 +0000 (10 13:30 -0700)
tree12f68138d95b70d450ab418fdfb300ebdcd2f003
parent04aebcbb1b6dccadc8862b2765265f65a946db57
parent693d92a1bbc9e42681c42ed190bd42b636ca876f
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: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/ehci-omap.c
drivers/usb/host/xhci-hub.c
drivers/usb/musb/musb_gadget.c
drivers/usb/musb/omap2430.c