| commit | 61906313bd41cde2f9aaa14e461e6108d3e71aaa | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon May 07 09:03:39 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon May 07 09:03:39 2012 -0700 |
| tree | c84805a9c67e3baf9e5acf13a3f55f7058a9131f | |
| parent | 3aa2ae74ba630ec9b98736d64aea8e4cb490861d [diff] | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 [diff] |
Merge 3.4-rc6 into usb-next This resolves the conflict with: drivers/usb/host/ehci-tegra.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>