tree d929d72d9e4f0abcd74cd65922b35123cd3455d5
parent d6d4655172f9c5b9402bb453ed9145a7ab5c46d0
parent eeafa5ef6de5acf678624a21f7dba7d43ba73845
author Linus Torvalds <torvalds@linux-foundation.org> 1247070761 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1247070761 -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: gpio_mouse - use standard driver registration method
  Input: mark serio and i8042 as suspended when hibernating too
  Input: add support for generic GPIO-based matrix keypad
  Input: arrange keyboards alphabetically
  Input: gpio-keys - avoid possibility of sleeping in timer function
  Input: gpio-keys - revert 'change timer to workqueue'
  Input: dm355evm_keys - fix kconfig symbol names
  Input: wacom - add DTF720a support and fix rotation on Intuos3
  Input: i8042 - more reset quirks for MSI Wind-clone netbooks