Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Apr 2013 16:15:13 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Apr 2013 16:15:13 +0000 (09:15 -0700)
commit0f177f873975fe7ece64d334887e83e081d88dec
tree6f06f10bdcf281ee3e20f9a02be377bf0fe2e334
parent53d945e1a2290641ac1041e61bdd45cba34a73bd
parent5846115b30f3a881e542c8bfde59a699c1c13740
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "Two more small fixups to the wacom driver"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wacom - fix "can not retrieve extra class descriptor" for DTH2242
  Input: wacom - DTH2242 Grip Pen id was off by one bit