Merge tag 'ib-mfd-input-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 15 Feb 2017 17:24:23 +0000 (09:24 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 15 Feb 2017 17:24:23 +0000 (09:24 -0800)
commitb0c9d043d4ae95d898aa79b2d89226262de471fd
tree688eb6a964313b6cc3992f0d3059d959ef0ead91
parentd0d89493bff8b7c7bf580197a44a1d49c50395b3
parent6ccc3a33810e8ec09936fa990c13370d9f61606f
Merge tag 'ib-mfd-input-v4.11-1' of git://git./linux/kernel/git/lee/mfd into next

Merge in cros-ec changes applied through MFD branch to resolve
conflicts.
drivers/input/keyboard/cros_ec_keyb.c