tree 14ba0178fc2c5e807282132e689236965b889e91
parent 250541fca717a5c9b0d3710e737b2ca32ebb6fbc
parent 014f61504af276ba9d9544d8a7401d8f8526eb73
author Linus Torvalds <torvalds@linux-foundation.org> 1271357395 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271357395 -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: wacom - switch mode upon system resume
  Revert "Input: wacom - merge out and in prox events"
  Input: matrix_keypad - allow platform to disable key autorepeat
  Input: ALPS - add signature for HP Pavilion dm3 laptops
  Input: i8042 - spelling fix
  Input: sparse-keymap - implement safer freeing of the keymap
  Input: update the status of the Multitouch X driver project
  Input: clarify the no-finger event in multitouch protocol
  Input: bcm5974 - retract efi-broken suspend_resume
  Input: sparse-keymap - free the right keymap on error