Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2016 23:34:24 +0000 (16:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2016 23:34:24 +0000 (16:34 -0700)
commitd0c1d15f5ed7f028d2c284b7fed7e73575d9c24d
tree95668ae49d855b243ab5f31f36eb1d12652373ef
parent4ee69866258620b105d06ae07da3bbe9fdb1699a
parent4af2ff91ec3f42b538a65cf12df5f9faf6aaa914
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:
 "Just a fix up for the firmware handling to the Silead driver (which is
  a new driver in this release)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: silead_gsl1680 - use "silead/" prefix for firmware loading
  Input: silead_gsl1680 - document firmware-name, fix implementation