From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 5 Jan 2006 02:44:12 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
X-Git-Tag: v2.6.16-rc1~474^2~22^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db9edfd7e339ca4113153d887e782dd05be5a9eb;p=pandora-kernel.git

Merge git://git./linux/kernel/git/gregkh/driver-2.6

Trivial manual merge fixup for usb_find_interface clashes.
---

db9edfd7e339ca4113153d887e782dd05be5a9eb
Reading git-diff-tree failed