tree 6c0742d47f8ce10e3c553b948a5003253ee4524e
parent f3b5933190c1fc5ad8f3a1dec594e9e849e088c0
parent 807362cd960daac415e2c8906750b2472c22c80e
author Linus Torvalds <torvalds@linux-foundation.org> 1410819121 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1410819121 -0700

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

Pull input updates from Dmitry Torokhov:
 "A few quirks for i8042/AT keyboards and a small device tree doc fix
  for Atmel Touchscreens"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: atmel_mxt_ts - fix merge in DT documentation
  Input: i8042 - also set the firmware id for MUXed ports
  Input: i8042 - add nomux quirk for Avatar AVIU-145A6
  Input: i8042 - add Fujitsu U574 to no_timeout dmi table
  Input: atkbd - do not try 'deactivate' keyboard on any LG laptops