Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 16 Apr 2009 15:51:52 +0000 (08:51 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 16 Apr 2009 15:51:52 +0000 (08:51 -0700)
commit0c387ec88abf4f1ddfe8c3be10ea981bc447b406
tree7510842a16aa54e3fec96aed2b3126109cda8d85
parentba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d
parent3f3e7c6e139f704e2f48ea3b45ff7724a8d46456
Merge branch 'next' into for-linus
drivers/input/input.c
drivers/input/touchscreen/ads7846.c