Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: linux-next: manual merge of the tegra tree with the pm tree | Date | Wed, 23 Jan 2013 14:50:19 +0100 |
| |
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: tegra: add Tegra specific clocks") from the tegra tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Thanks for the notice and please carry the fix.
Rafael
-- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
| |