diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2019-06-29 13:02:48 +0200 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2019-06-29 13:02:48 +0200 |
commit | 45c9cc681d8d9122fd64e1f2a4cc82e3dcc7f0a5 (patch) | |
tree | 18ab31531ac870d6fa1ba2022a1c6d6886277a09 /drivers/i2c/i2c-core.h | |
parent | 504ee6b306a70a106c2e8858fd916ed8c43c5776 (diff) | |
parent | 05af0765707fc136433ab380d5d627afe3b8dda9 (diff) |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-5.3
I realize that there are changes in drivers/i2c/busses/i2c-i801.c that strictly
speaking don't belong here, but I hope you don't mind. These changes are all
about the interaction with the i2c-mux-gpio code, and I did a test-merge a few
days ago w/o conflicts.
Anyway, the GPIO-work from Linus Walleij (with help from Serge Semin) in the
i2c-mux-gpio and i2c-arb-gpio-challenge drivers is the main feature.
Diffstat (limited to 'drivers/i2c/i2c-core.h')
0 files changed, 0 insertions, 0 deletions