Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: fix typo in keycode validation supporting large scancodes
  Input: aiptek - tighten up permissions on sysfs attributes
  Input: sysrq - pass along lone Alt + SysRq

...

This commit is contained in:

Linus Torvalds 2010-11-19 10:31:04 -08:00

parent 973d168de2 de391d1250

commit 864ee6cb22

3 changed files with 139 additions and 60 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/input/input.c

View file

28

drivers/input/tablet/aiptek.c

View file

175

drivers/tty/sysrq.c

View file