git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.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	61906313bd41cde2f9aaa14e461e6108d3e71aaa
tree	c84805a9c67e3baf9e5acf13a3f55f7058a9131f	tree \| snapshot
parent	3aa2ae74ba630ec9b98736d64aea8e4cb490861d	commit \| diff
parent	d48b97b403d23f6df0b990cee652bdf9a52337a3	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 for KaRo TX COM modules

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