From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Sep 2014 22:12:01 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~9628
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b92178623f190a9898fed3632fb40b17f6789673;p=mirror_ubuntu-artful-kernel.git

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
---

b92178623f190a9898fed3632fb40b17f6789673