From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 May 2012 16:03:39 +0000 (-0700)
Subject: Merge 3.4-rc6 into usb-next
X-Git-Tag: v3.5-rc1~149^2~140
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61906313bd41cde2f9aaa14e461e6108d3e71aaa;p=pandora-kernel.git

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>
---

61906313bd41cde2f9aaa14e461e6108d3e71aaa
Reading git-diff-tree failed