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)
commit92944c1c943647c7eb39c081feeecdd169f68ee4
tree1412deee46f6be19cf9b5a65a8d76ed4553866a8
parent77686517977e77d101c8a7b397717df00a88922b
parentd4f5f937c3dfdea9f49c3cdeea8813b0d9f7715a
Merge branch 'mrst-touchscreen' into next

Conflicts:
drivers/input/touchscreen/Makefile
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/staging/Kconfig
drivers/staging/Makefile