Messages in this thread | | | Date | Wed, 23 Jan 2013 14:09:29 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the pm tree |
| |
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in drivers/devfreq/exynos4_bus.c between commit 8fa938acb318 ("PM / devfreq: exynos4_bus: honor RCU lock usage") from the pm tree and commit 8a168ca7074b ("treewide: Fix typo in various drivers") from the trivial tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/devfreq/exynos4_bus.c index 46d94e9,e1ac076..0000000 --- a/drivers/devfreq/exynos4_bus.c +++ b/drivers/devfreq/exynos4_bus.c @@@ -658,7 -636,7 +658,7 @@@ static int exynos4_bus_target(struct de if (old_freq == freq) return 0; - dev_dbg(dev, "targetting %lukHz %luuV\n", freq, new_oppinfo.volt); - dev_dbg(dev, "targeting %lukHz %luuV\n", freq, opp_get_voltage(opp)); ++ dev_dbg(dev, "targeting %lukHz %luuV\n", freq, new_oppinfo.volt); mutex_lock(&data->lock); [unhandled content-type:application/pgp-signature] | |