diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-28 13:03:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-28 13:03:00 -0700 |
| commit | 2946369ee277fa9fcc3372aabddc9c15dfabf744 (patch) | |
| tree | f6aa776b63db2a5352cd05a3ad2437e212f72885 /drivers/edac/e7xxx_edac.c | |
| parent | 1fac1fa965a9fbdb38d8a4b945db3521f801c946 (diff) | |
| parent | 8a0435d958fb36d93b8df610124a0e91e5675c82 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov:
"Updates to Synaptics touchpad to better cope with devices in Lenovo
laptops, and a couple more fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics - add manual min/max quirk for ThinkPad X240
Input: synaptics - add manual min/max quirk
Input: cypress_ps2 - don't report as a button pads
Input: da9052_onkey - use correct register bit for key status
Input: adp5588-keys - get value from data out when dir is out
Diffstat (limited to 'drivers/edac/e7xxx_edac.c')
0 files changed, 0 insertions, 0 deletions