Merge branch 'tsc2005' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 17 Mar 2011 06:29:56 +0000 (23:29 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 17 Mar 2011 06:29:56 +0000 (23:29 -0700)
1  2 
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile

Simple merge
Simple merge