From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 22 Dec 2010 20:25:34 +0000 (-0800)
Subject: USB: Merge 2.6.37-rc5 into usb-next
X-Git-Tag: v2.6.38-rc1~465^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2af10844eb6ed104f9505bf3a7ba3ceb02264f31;p=pandora-kernel.git

USB: Merge 2.6.37-rc5 into usb-next

This is to resolve the conflict in the file,
drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
needed for the 2.6.37 release.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

2af10844eb6ed104f9505bf3a7ba3ceb02264f31
Reading git-diff-tree failed