7d9aca39dc
Resolved simple add/add conflicts: drivers/base/regmap/internal.h drivers/base/regmap/regmap.c
Resolved simple add/add conflicts: drivers/base/regmap/internal.h drivers/base/regmap/regmap.c