diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 09:02:54 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 09:02:54 +0100 |
| commit | 5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1 (patch) | |
| tree | c5aa57e70d901ae05b25e61387a351e6b0b2826b /drivers/input/gameport | |
| parent | Input: stmpe-ts - add DT support for stmpe touchscreen (diff) | |
| parent | ARM - OMAP: ads7846: fix pendown debounce setting (diff) | |
| download | linux-5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1.tar.xz linux-5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1.zip | |
Merge branch 'for-linus' into next
Bring in changes to ads7846 to avoid mereg conflicts.
Diffstat (limited to 'drivers/input/gameport')
0 files changed, 0 insertions, 0 deletions