tree c84805a9c67e3baf9e5acf13a3f55f7058a9131f
parent 3aa2ae74ba630ec9b98736d64aea8e4cb490861d
parent d48b97b403d23f6df0b990cee652bdf9a52337a3
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1336406619 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1336406619 -0700

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>