From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 12 Mar 2012 16:13:31 +0000 (-0700)
Subject: Merge 3.3-rc7 into usb-next
X-Git-Tag: v3.4-rc1~184^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7a0d426f3e7ec321b8037238b6426566df36edb;p=pandora-kernel.git

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

f7a0d426f3e7ec321b8037238b6426566df36edb
Reading git-diff-tree failed