git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8ad95c6 9621dad)

author	Greg Kroah-Hartman <gregkh@suse.de>
	Mon, 29 Aug 2011 15:56:17 +0000 (08:56 -0700)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Mon, 29 Aug 2011 15:56:17 +0000 (08:56 -0700)
commit	d24796a83eef24d5860f42dcfa827df33f0b54e0
tree	2bd574d8ab1db79b369735ba0519a66760019189	tree \| snapshot
parent	8ad95c648ce15cc2a0e2109c6e08773949bae72f	commit \| diff
parent	9621dad28d9fd54c23a07dbac6507346c07b8cd6	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-s5p.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-ring.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_gadget.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/ftdi_sio.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.