7e69a8c4d0
Conflicts: arch/arm/mach-versatile/core.c |
||
---|---|---|
.. | ||
algos | ||
busses | ||
chips | ||
i2c-boardinfo.c | ||
i2c-core.c | ||
i2c-core.h | ||
i2c-dev.c | ||
Kconfig | ||
Makefile |
7e69a8c4d0
Conflicts: arch/arm/mach-versatile/core.c |
||
---|---|---|
.. | ||
algos | ||
busses | ||
chips | ||
i2c-boardinfo.c | ||
i2c-core.c | ||
i2c-core.h | ||
i2c-dev.c | ||
Kconfig | ||
Makefile |