]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb/usb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 02:41:53 +0000 (13:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 02:41:53 +0000 (13:41 +1100)
commitbd9dbaabb13a3fccd9da46eb8d415d2ef21667e1
tree67ed60405b1e8c8b0465640d8e95bd4790fc2988
parent16b688d001d76f5a7ee00498abc59036cc6ea73e
parentcdb2fac78321a8d621b5612c7ddfe96bdbe7d267
Merge remote-tracking branch 'usb/usb-next'

Conflicts:
drivers/usb/early/ehci-dbgp.c
drivers/usb/serial/usb_wwan.c