tree 6c813af2c95a469a42e12df0b16ee357c377c80b
parent 131f7340b4f93f9a4a8e5a65abbd352b34d0ee08
parent d82f1c35348cebe2fb2d4a4d31ce0ab0769e3d93
author Linus Torvalds <torvalds@linux-foundation.org> 1249666934 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1249666934 -0700

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 - make matrix keymap size dynamic
  Input: wistron_btns - support Prestigio Wifi RF kill button
  Input: i8042 - add Asus G1S to noloop exception list