tree 945afa7596fcdc4d960812dee1812c187d282bff
parent 3f3b55bf7833d81d00c793d722e2af58d3b12963
parent d714aaf649460cbfd5e82e75520baa856b4fa0a0
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1363821707 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1363821707 -0700

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>