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: d3fce04 5cb6fe3)

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	10150f8ec3309356b75e7b103c32987310562670
tree	2bd574d8ab1db79b369735ba0519a66760019189	tree \| snapshot
parent	d3fce04d00ed540d41d01114d1d7be4cf7c0a8a5	commit \| diff
parent	5cb6fe33a9cff36e992099f38db1658ca5db621e	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.