From: Dmitry Torokhov <dtor@insightbb.com>
Date: Fri, 8 Dec 2006 06:07:56 +0000 (-0500)
Subject: Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.20-rc1~34^2~412
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bef986502fa398b1785a3979b1aa17cd902d3527;p=pandora-kernel.git

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

Conflicts:

	drivers/usb/input/hid.h
---

bef986502fa398b1785a3979b1aa17cd902d3527
Reading git-diff-tree failed