| commit | b0c9d043d4ae95d898aa79b2d89226262de471fd | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Wed Feb 15 09:24:23 2017 -0800 |
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Wed Feb 15 09:24:23 2017 -0800 |
| tree | 688eb6a964313b6cc3992f0d3059d959ef0ead91 | |
| parent | d0d89493bff8b7c7bf580197a44a1d49c50395b3 [diff] | |
| parent | 6ccc3a33810e8ec09936fa990c13370d9f61606f [diff] |
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.