38e23194e1
Conflicts (trivial context stuff): drivers/base/regmap/regmap.c include/linux/regmap.h
Conflicts (trivial context stuff): drivers/base/regmap/regmap.c include/linux/regmap.h