From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 22 Apr 2012 22:25:26 +0000 (-0700)
Subject: Merge 3.4-rc4 into usb-next.
X-Git-Tag: v3.5-rc1~149^2~328
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09091a4d5f2dd378dcf71de50b48cdacc58a8ac0;p=pandora-kernel.git

Merge 3.4-rc4 into usb-next.

This resolves the conflict in:
	drivers/usb/host/ehci-fsl.c
And picks up loads of xhci bugfixes to make it easier for others to test
with.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

09091a4d5f2dd378dcf71de50b48cdacc58a8ac0
Reading git-diff-tree failed