]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita09ca8ad38d947872e0bf40e18df9b26ae590ffb
tree945afa7596fcdc4d960812dee1812c187d282bff
parent110f74be9db2d7bf2aaa22f2ead36293123d5ce9
parentb2eb4f460a534a6ea5f12d2440856d66c23ca51a
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
drivers/usb/host/ehci-hub.c
drivers/usb/host/ehci-timer.c