Re: linux-next: manual merge of the tegra tree with the pm tree

2013-01-23 Thread Rafael J. Wysocki
On Wednesday, January 23, 2013 04:33:03 PM Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tegra tree got a conflict in > drivers/clk/Makefile between commit bd3bffb544b1 ("clk: x86: add support > for Lynxpoint LPSS clocks") from the pm tree and commit 82f6b0926514 > ("clk: t

linux-next: manual merge of the tegra tree with the pm tree

2013-01-22 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tegra tree got a conflict in drivers/clk/Makefile between commit bd3bffb544b1 ("clk: x86: add support for Lynxpoint LPSS clocks") from the pm tree and commit 82f6b0926514 ("clk: tegra: add Tegra specific clocks") from the tegra tree. I fixed it up (see belo