diff options
| author | Dmitry Torokhov | 2013-09-18 07:58:33 -0700 |
|---|---|---|
| committer | Dmitry Torokhov | 2013-09-18 07:58:33 -0700 |
| commit | 4ba25a496f62129a2ad8c2436ab2b402752dc66c (patch) | |
| tree | 8abf41a79f293832a430a9609530c24cd365466c /drivers/input/keyboard/lpc32xx-keys.c | |
| parent | 390de835b61228abf6646f2b14530edca8d7512f (diff) | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
Merge tag 'v3.11' into next
Merge with mainline to bring in sync changes to cyttsp4 driver.
Diffstat (limited to 'drivers/input/keyboard/lpc32xx-keys.c')
0 files changed, 0 insertions, 0 deletions