From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 29 Aug 2011 15:56:17 +0000 (-0700)
Subject: Merge 3.1-rc4 into usb-next
X-Git-Tag: v3.2-rc1~183^2~179
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ed962a208cb72cff29a107d6c73247526017ddb;p=pandora-kernel.git

Merge 3.1-rc4 into usb-next

This was done to resolve a conflict in this file:
	drivers/usb/host/xhci-ring.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

6ed962a208cb72cff29a107d6c73247526017ddb
Reading git-diff-tree failed