diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-22 21:45:34 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-22 21:45:34 -1000 |
| commit | 26d29d06ea020411559f75ec908db235ca1838d9 (patch) | |
| tree | 3839843cd997b63c656c76118ac78db0ec41c5df /drivers/sbus | |
| parent | 5a903166dd31a42e39283b075cc6b9a9c079d1af (diff) | |
| parent | 0a0d62857366d8a6531e7fed1c3ccdd9a2b5b40b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"This fixes recent regression where /dev/input/mice got assigned wrong
device node which messed up setups with static /dev, and a regression
in ads7846 GPIO debounce setup."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
ARM - OMAP: ads7846: fix pendown debounce setting
Input: ads7846 - enable pendown GPIO debounce time setting
Input: mousedev - move /dev/input/mice to the correct minor
Input: MT - document new 'flags' argument of input_mt_init_slots()
Diffstat (limited to 'drivers/sbus')
0 files changed, 0 insertions, 0 deletions