From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sun, 5 Sep 2010 19:20:24 +0000 (-0700)
Subject: Merge branch 'mrst-touchscreen' into next
X-Git-Tag: v2.6.37-rc1~135^2^2~54
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92944c1c943647c7eb39c081feeecdd169f68ee4;p=pandora-kernel.git

Merge branch 'mrst-touchscreen' into next

Conflicts:
	drivers/input/touchscreen/Makefile
---

92944c1c943647c7eb39c081feeecdd169f68ee4
Reading git-diff-tree failed