]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit047552f7037f80a6891db5c9405c85b2bbc15a1c
tree688eb6a964313b6cc3992f0d3059d959ef0ead91
parent76fd388762535300ebf84dc1ebd924fc1bb229d3
parentf0ca6fcbb20187f734129c560721ebb1d9584d00
Merge tag 'ib-mfd-input-v4.11-1' of git://git.kernel.org/pub/scm/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