diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-15 20:24:23 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-15 20:24:23 +0300 |
| commit | b0c9d043d4ae95d898aa79b2d89226262de471fd (patch) | |
| tree | 688eb6a964313b6cc3992f0d3059d959ef0ead91 /drivers/ide | |
| parent | d0d89493bff8b7c7bf580197a44a1d49c50395b3 (diff) | |
| parent | 6ccc3a33810e8ec09936fa990c13370d9f61606f (diff) | |
| download | linux-b0c9d043d4ae95d898aa79b2d89226262de471fd.tar.xz | |
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.
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions