tree 37df1d20532d61efbe2b4c33fb0ed376f08a3632
parent d2865c7d4ef818421941579e185c1e4743692f85
parent 3049683eafdbbbd7350b0e5ca02a2d8c026a3362
author Linus Torvalds <torvalds@linux-foundation.org> 1411754671 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1411754671 -0700

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