linux-next: manual merge of the clk tree with the trivial tree

2013-04-10 Thread Stephen Rothwell
Hi Mike, Today's linux-next merge of the clk tree got a conflict in drivers/clk/mvebu/clk-core.c between commit 07f42258893d ("treewide: Fix typos in printk") from the trivial tree and commit 4cb24e68a5af ("clk: mvebu: Fix valid value range checking for cpu_freq_select") from the clk tree. I

linux-next: manual merge of the clk tree with the trivial tree

2013-04-10 Thread Stephen Rothwell
Hi Mike, Today's linux-next merge of the clk tree got a conflict in drivers/clk/mvebu/clk-core.c between commit 07f42258893d (treewide: Fix typos in printk) from the trivial tree and commit 4cb24e68a5af (clk: mvebu: Fix valid value range checking for cpu_freq_select) from the clk tree. I fixed