diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-09-05 12:20:24 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-09-05 12:20:24 -0700 |
| commit | 92944c1c943647c7eb39c081feeecdd169f68ee4 (patch) | |
| tree | 1412deee46f6be19cf9b5a65a8d76ed4553866a8 /drivers/input/tablet/wacom_sys.c | |
| parent | 77686517977e77d101c8a7b397717df00a88922b (diff) | |
| parent | d4f5f937c3dfdea9f49c3cdeea8813b0d9f7715a (diff) | |
Merge branch 'mrst-touchscreen' into next
Conflicts:
drivers/input/touchscreen/Makefile
Diffstat (limited to 'drivers/input/tablet/wacom_sys.c')
0 files changed, 0 insertions, 0 deletions