From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Wed, 21 Dec 2005 04:03:50 +0000 (-0500)
Subject: Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
X-Git-Tag: v2.6.16-rc1~928^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=041387d98460b3947587929ef3a4773b8c48538f;p=pandora-kernel.git

Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
---

041387d98460b3947587929ef3a4773b8c48538f
Reading git-diff-tree failed