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	02a842b994ff46d3253baf59327dcccbb4b78ff1
tree	c84805a9c67e3baf9e5acf13a3f55f7058a9131f	tree \| snapshot
parent	f63960ad260329fd8a6a21ea2129aa17b596152c	commit \| diff
parent	2b908e7376fa178128003e46bb83855a61614e49	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