tree b3c4bbb867b194750586cacff26c8455051ea259
parent 84d4db0e22965334ae8272f324d31fb4657465aa
parent 3619b8fead04ab9de643712e757ef6b5f79fd1ab
author Linus Torvalds <torvalds@linux-foundation.org> 1279824375 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1279824375 -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: synaptics - relax capability ID checks on newer hardware
  Input: twl40300-keypad - fix handling of "all ground" rows
  Input: gamecon - reference correct pad in gc_psx_command()
  Input: gamecon - reference correct input device in NES mode
  Input: w90p910_keypad - change platfrom driver name to 'nuc900-kpi'
  Input: i8042 - add Gigabyte Spring Peak to dmi_noloop_table
  Input: qt2160 - rename kconfig symbol name