]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/firewire/core-transaction.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Feb 2011 17:40:27 +0000 (09:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Feb 2011 17:40:27 +0000 (09:40 -0800)
commit87450bd55d6f7caa472b5db49a97ca373baf2577
tree00cc4e9da0e486c5d540c2f733a75a9230405f40
parent055d219441cc23f631240335fd369b6b5852681a
parentcfaea56741360311d0dabcb6603fa78c2e3de155
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
drivers/input/input.c
drivers/tty/sysrq.c
include/linux/input/matrix_keypad.h