diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-06-17 18:02:44 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-06-17 18:02:44 +0200 |
| commit | 15439dd37f92f930ac7fc65a4f261834e4215bb0 (patch) | |
| tree | ec8e4a7cffd1cbb55ae4970c3172fa9a6fb0c0f7 /drivers/input/touchscreen/ucb1400_ts.c | |
| parent | Input: pxa27x_keypad - add wakeup support (diff) | |
| parent | Input: appletouch - implement reset-resume logic (diff) | |
| download | linux-15439dd37f92f930ac7fc65a4f261834e4215bb0.tar.xz linux-15439dd37f92f930ac7fc65a4f261834e4215bb0.zip | |
Merge branch 'for-linus' into next
Conflicts:
drivers/input/mouse/appletouch.c
Diffstat (limited to 'drivers/input/touchscreen/ucb1400_ts.c')
0 files changed, 0 insertions, 0 deletions