| commit | cf2d9500a5a0df61713b56f2f40aa0b81a6f9f63 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Mar 20 16:21:47 2013 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Mar 20 16:21:47 2013 -0700 |
| tree | 945afa7596fcdc4d960812dee1812c187d282bff | |
| parent | 3f3b55bf7833d81d00c793d722e2af58d3b12963 [diff] | |
| parent | d714aaf649460cbfd5e82e75520baa856b4fa0a0 [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>