From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 10 May 2011 20:30:45 +0000 (-0700)
Subject: Merge branch 2.6.39-rc7 into usb-linus
X-Git-Tag: v3.0-rc1~337^2~51
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a1629c771b1a60bc6d73394d869fe69b13200dc;p=pandora-kernel.git

Merge branch 2.6.39-rc7 into usb-linus

This was needed to resolve a conflict in:
	drivers/usb/host/isp1760-hcd.c

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

8a1629c771b1a60bc6d73394d869fe69b13200dc
Reading git-diff-tree failed