Hi Liam,
Today's linux-next merge of the voltage tree got a conflict in
drivers/regulator/twl-regulator.c between commit
441a450554dada1c59fc06fdf068cb0eeba53c6d ("regulator: Add support for
twl6030 regulators") from Linus' tree and commits
6360cf42ae51be5f6e6e72d6e81f202d9db0f7e9 ("twl4030-regulator: Remove
regulator from all groups when disabling") and
3277b9fce0fcaa68d5947429e062163852ebc6fb ("twl4030-regulator: Add all TWL
regulators to twreg_info") from the voltage tree.
I cannot begin to fix this mess up. I do wonder why the regulator patch
above was never in linux-next before being sent upstream yesterday
(Samuel?). All I can do is use the version of the voltage tree from
next-20091120 (commit id b0a7a2ad0aebb35934de6d2509c73fe93a362c0e) for
today and hope that Liam can do the merge with Linus' tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpBon37DXhag.pgp
Description: PGP signature
