tree 505e7d0264500db94534f1226684f78af7757289
parent fde7d9049e55ab85a390be7f415d74c9f62dd0f9
parent b790f5d1260b4c962bd066cd34ae982943c27fe1
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1331568811 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1331568811 -0700

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>