From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Sat, 10 Sep 2005 01:14:47 +0000 (-0500)
Subject: Manual merge with Linus
X-Git-Tag: v2.6.14-rc1~128^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d344c5e0856ad03278d8700b503762dbc8b86e12;p=pandora-kernel.git

Manual merge with Linus
---

d344c5e0856ad03278d8700b503762dbc8b86e12
Reading git-diff-tree failed