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

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sat, 17 Nov 2012 02:46:21 +0000 (18:46 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sat, 17 Nov 2012 02:46:21 +0000 (18:46 -0800)
commit	0c864d8b3e51bd61f43484268c9aa4eb9a199b02
tree	de9fa5c3792c84fa173e6d27c856bde0254f7eeb	tree \| snapshot
parent	4fd24483d1de7a3c183fa862fa9ff13b49361966	commit \| diff
parent	f4a75d2eb7b1e2206094b901be09adb31ba63681	commit \| diff

Merge 3.7-rc6 into usb-next.

This resolves a conflict with these files:
drivers/usb/early/ehci-dbgp.c
drivers/usb/host/ehci-ls1x.c
drivers/usb/host/ohci-xls.c
drivers/usb/musb/ux500.c

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

Linux kernel for KaRo TX COM modules

RSS Atom

drivers/usb/core/hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_gadget.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/keyspan.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/usb_wwan.c	diff1 \|	diff2 \|	blob \| history