| commit | f7a0d426f3e7ec321b8037238b6426566df36edb | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Mar 12 09:13:31 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Mar 12 09:13:31 2012 -0700 |
| tree | 505e7d0264500db94534f1226684f78af7757289 | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 [diff] | |
| parent | b790f5d1260b4c962bd066cd34ae982943c27fe1 [diff] |
Merge 3.3-rc7 into usb-next This resolves the conflict with drivers/usb/host/ehci-fsl.h that happened with changes in Linus's and this branch at the same time. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>