Messages in this thread | | | Date | Wed, 28 Nov 2012 17:12:07 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the clk tree with the arm-soc tree |
| |
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in arch/arm/mach-ux500/cpu-db8500.c between commit e13316d60658 ("ARM: ux500: Rename dbx500 cpufreq code to be more generic") from the arm-soc tree and commit 50545e1d237b ("ARM: ux500: Remove cpufreq platform device") from the clk tree.
I fixed it up (I used the clk tree version since that removed the code that the arm-soc tree version modified) 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] | |