tree 99294c7ab6c9891cfe6bcf4b68841686393840d9
parent 41615e811b3031728a003da077005e8dcf9d71cc
parent fa46c7984092f3dbdbb3bcd7338d81a1168d9d2b
author Linus Torvalds <torvalds@linux-foundation.org> 1377904552 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1377904552 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input layer updates from Dmitry Torokhov:
 "Just a couple of new IDs in Wacom and xpad drivers, i8042 is now
  disabled on ARC, and data checks in Elantech driver that were overly
  relaxed by the previous patch are now tightened"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: i8042 - disable the driver on ARC platforms
  Input: xpad - add signature for Razer Onza Classic Edition
  Input: elantech - fix packet check for v3 and v4 hardware
  Input: wacom - add support for 0x300 and 0x301