]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 973d168 de391d1)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Nov 2010 18:31:04 +0000 (10:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Nov 2010 18:31:04 +0000 (10:31 -0800)
* '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

1  2 
drivers/input/input.c patch | diff1 | diff2 | blob | history
drivers/tty/sysrq.c patch | diff1 | diff2 | blob | history

diff --cc drivers/input/input.c
Simple merge
diff --cc drivers/tty/sysrq.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.