]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 2.6.39-rc7 into usb-linus
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 10 May 2011 20:30:45 +0000 (13:30 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 10 May 2011 20:30:45 +0000 (13:30 -0700)
commit965b808246ff833352cb3d679f7a8bcd8ad414bd
tree12f68138d95b70d450ab418fdfb300ebdcd2f003
parentc431d0ac38f0868a0c47fd706ac46d2f01aa376c
parent2787d12aaa42cb4b78bad463394a382a6cb6cadc
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