Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/regulator/tps65910-regulator.c between commit a40a9c436b62
("regulator: tps65910: Use generic regmap enable/disable operations")
from Linus' tree and commit 3f7e82759c69 ("mfd: Commonize tps65910 regmap
access through header") from the mfd tree.

The former removes the routines that the latter updates, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au