From: Dmitry Torokhov <dtor@insightbb.com>
Date: Tue, 1 May 2007 04:24:54 +0000 (-0400)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.22-rc1~1037^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775;p=pandora-kernel.git

Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c
---

bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775
Reading git-diff-tree failed