Skip to content
Commit b0c9d043 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

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.
parents d0d89493 6ccc3a33
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment