]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 3.1-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 29 Aug 2011 15:56:17 +0000 (08:56 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 29 Aug 2011 15:56:17 +0000 (08:56 -0700)
commit10150f8ec3309356b75e7b103c32987310562670
tree2bd574d8ab1db79b369735ba0519a66760019189
parentd3fce04d00ed540d41d01114d1d7be4cf7c0a8a5
parent5cb6fe33a9cff36e992099f38db1658ca5db621e
Merge 3.1-rc4 into usb-next

This was done to resolve a conflict in this file:
drivers/usb/host/xhci-ring.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
MAINTAINERS
drivers/usb/host/ehci-hub.c
drivers/usb/host/ehci-s5p.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c
drivers/usb/musb/musb_gadget.c
drivers/usb/serial/ftdi_sio.c