diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 22:16:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 22:16:09 +0200 |
| commit | b903bd69e3fa156598def8d6433dfe5352af8da3 (patch) | |
| tree | a13380f31bab62acfd667910656525c09511cb8a /tools/Makefile | |
| parent | Linux 3.5-rc7 (diff) | |
| parent | EHCI: centralize controller initialization (diff) | |
| download | linux-b903bd69e3fa156598def8d6433dfe5352af8da3.tar.xz linux-b903bd69e3fa156598def8d6433dfe5352af8da3.zip | |
Merge 3.5-rc7 into usb-next
This resolves the merge issue with the drivers/usb/host/ehci-omap.c
file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/Makefile')
0 files changed, 0 insertions, 0 deletions