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)
commitdef179c271ac9b5020deca798470521f14d11edd
tree01e78608ec3c458226a8f39572db4f51100223fa
parent49851ca04c7f941ef6f5ca04751b0e0fefe9d50d
parent5cb81d19bae47adcb073a5e5a3bc40dd252f239e
Merge branch 'tsc2005' into next
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile