Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Sep 2014 18:04:31 +0000 (11:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Sep 2014 18:04:31 +0000 (11:04 -0700)
commit135a21881d32d81a5900f3fe13deea31c9e55dd1
tree37df1d20532d61efbe2b4c33fb0ed376f08a3632
parente05c0d35574d1c98ab27d3aebabccfc833d6b0ef
parent90887d91a672e6dc98b57cdad91315c37dd05056
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fix from Dmitry Torokhov:
 "A small fixup to i8042 adding Asus X450LCP to the nomux list"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: i8042 - fix Asus X450LCP touchpad detection