| commit | 92944c1c943647c7eb39c081feeecdd169f68ee4 | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Sun Sep 05 12:20:24 2010 -0700 |
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Sun Sep 05 12:20:24 2010 -0700 |
| tree | 1412deee46f6be19cf9b5a65a8d76ed4553866a8 | |
| parent | 77686517977e77d101c8a7b397717df00a88922b [diff] | |
| parent | d4f5f937c3dfdea9f49c3cdeea8813b0d9f7715a [diff] |
Merge branch 'mrst-touchscreen' into next Conflicts: drivers/input/touchscreen/Makefile