From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sat, 29 Oct 2005 02:59:31 +0000 (-0700)
Subject: USB: fix up some odd parts due to partial merges
X-Git-Tag: v2.6.15-rc1~731^2~16^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1;p=pandora-kernel.git

USB: fix up some odd parts due to partial merges

Thanks to Andrew for doing the hard work on this.

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

Reading git-diff-tree failed