forked from luck/tmp_suning_uos_patched
7d9aca39dc
Resolved simple add/add conflicts: drivers/base/regmap/internal.h drivers/base/regmap/regmap.c |
||
---|---|---|
.. | ||
internal.h | ||
Kconfig | ||
Makefile | ||
regcache-lzo.c | ||
regcache-rbtree.c | ||
regcache.c | ||
regmap-debugfs.c | ||
regmap-i2c.c | ||
regmap-irq.c | ||
regmap-spi.c | ||
regmap.c |