diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-21 03:21:47 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-21 03:21:47 +0400 |
| commit | cf2d9500a5a0df61713b56f2f40aa0b81a6f9f63 (patch) | |
| tree | 945afa7596fcdc4d960812dee1812c187d282bff /arch/arm/include/asm/div64.h | |
| parent | 3f3b55bf7833d81d00c793d722e2af58d3b12963 (diff) | |
| parent | d714aaf649460cbfd5e82e75520baa856b4fa0a0 (diff) | |
| download | linux-cf2d9500a5a0df61713b56f2f40aa0b81a6f9f63.tar.xz | |
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>
Diffstat (limited to 'arch/arm/include/asm/div64.h')
0 files changed, 0 insertions, 0 deletions