diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 09:40:27 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 09:40:27 -0800 |
commit | 87450bd55d6f7caa472b5db49a97ca373baf2577 (patch) | |
tree | 00cc4e9da0e486c5d540c2f733a75a9230405f40 /kernel | |
parent | 055d219441cc23f631240335fd369b6b5852681a (diff) | |
parent | cfaea56741360311d0dabcb6603fa78c2e3de155 (diff) | |
download | linux-87450bd55d6f7caa472b5db49a97ca373baf2577.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: matrix_keypad - increase the limit of rows and columns
Input: wacom - fix error path in wacom_probe()
Input: ads7846 - check proper condition when freeing gpio
Revert "Input: do not pass injected events back to the originating handler"
Input: sysrq - rework re-inject logic
Input: serio - clear pending rescans after sysfs driver rebind
Input: rotary_encoder - use proper irqflags
Input: wacom_w8001 - report resolution to userland
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions