]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a2ccb19 29fbf4a)
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)
commit8b8612e1eda29245fa8e776bcb51f25eb6f8ca2d
tree945afa7596fcdc4d960812dee1812c187d282bfftree | snapshot
parenta2ccb1993d6ac4abfa5f4f1422207aaff3cec531commit | diff
parent29fbf4a2587cde5fe39bb1f241754a8fc6b5a9f0commit | 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 Source Tree.