| commit | b903bd69e3fa156598def8d6433dfe5352af8da3 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jul 16 13:16:09 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jul 16 13:16:09 2012 -0700 |
| tree | a13380f31bab62acfd667910656525c09511cb8a | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c [diff] | |
| parent | 1a49e2ac9651df7349867a5cf44e2c83de1046af [diff] |
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>