From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 17 Jun 2008 16:02:44 +0000 (-0400)
Subject: Merge branch 'for-linus' into next
X-Git-Tag: v2.6.27-rc1~958^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15439dd37f92f930ac7fc65a4f261834e4215bb0;p=pandora-kernel.git

Merge branch 'for-linus' into next

Conflicts:

	drivers/input/mouse/appletouch.c
---

15439dd37f92f930ac7fc65a4f261834e4215bb0
Reading git-diff-tree failed