Messages in this thread | | | Date | Mon, 10 Dec 2012 15:29:14 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the regulator tree |
| |
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in drivers/regulator/palmas-regulator.c between commit bdc4baacebda ("regulator: palmas: Convert palmas_ops_smps to regulator_[get| set]_voltage_sel_regmap") from the regulator tree and commit 02582e9bcc36 ("treewide: fix typo of "suport" in various comments and Kconfig") from the trivial tree.
I fixed it up (I used the former as it also fixed the typo) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |