Merge branch 'mrst-touchscreen' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 5 Sep 2010 19:20:24 +0000 (12:20 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 5 Sep 2010 19:20:24 +0000 (12:20 -0700)
Conflicts:
drivers/input/touchscreen/Makefile


Trivial merge