be4af5dfa6
Conflicts: drivers/i2c/busses/i2c-designware-core.c Fixed up merge conflic |
||
---|---|---|
.. | ||
algos | ||
busses | ||
muxes | ||
i2c-boardinfo.c | ||
i2c-core.c | ||
i2c-core.h | ||
i2c-dev.c | ||
i2c-mux.c | ||
i2c-smbus.c | ||
Kconfig | ||
Makefile |
be4af5dfa6
Conflicts: drivers/i2c/busses/i2c-designware-core.c Fixed up merge conflic |
||
---|---|---|
.. | ||
algos | ||
busses | ||
muxes | ||
i2c-boardinfo.c | ||
i2c-core.c | ||
i2c-core.h | ||
i2c-dev.c | ||
i2c-mux.c | ||
i2c-smbus.c | ||
Kconfig | ||
Makefile |