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

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

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 7 May 2012 16:03:39 +0000 (09:03 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 7 May 2012 16:03:39 +0000 (09:03 -0700)
commit	2a9b93ed83a17af2831a5fa931db1911ae7f2451
tree	c84805a9c67e3baf9e5acf13a3f55f7058a9131f	tree \| snapshot
parent	b79b2e4e9d2f81777dbd5e078551cd76da381e57	commit \| diff
parent	b46dfabc46f2f4b2b4cf8bc5e8c58410ed27a893	commit \| diff

Merge 3.4-rc6 into usb-next

This resolves the conflict with:
drivers/usb/host/ehci-tegra.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Linux Kernel Source Tree.

RSS Atom

drivers/usb/class/cdc-wdm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-pci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-tegra.c	diff1 \|	diff2 \|	blob \| history
include/linux/usb/hcd.h	diff1 \|	diff2 \|	blob \| history