]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3f3b55b d714aaf)
Merge branch 'usb-linus' into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Mar 2013 23:21:47 +0000 (16:21 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Mar 2013 23:21:47 +0000 (16:21 -0700)
commitcf2d9500a5a0df61713b56f2f40aa0b81a6f9f63
tree945afa7596fcdc4d960812dee1812c187d282bfftree | snapshot
parent3f3b55bf7833d81d00c793d722e2af58d3b12963commit | diff
parentd714aaf649460cbfd5e82e75520baa856b4fa0a0commit | diff
Merge branch 'usb-linus' into usb-next

This is to pick up the fixes in that branch, and let Alan fix the merge
error in drivers/usb/host/ehci-timer.c better than I just did (as I know
I messed it up...)

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ehci-hcd.c diff1 | diff2 | blob | history
drivers/usb/host/ehci-hub.c diff1 | diff2 | blob | history
drivers/usb/host/ehci-timer.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules