Subject: linux-next: manual merge of the pm tree with the samsung tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 17 Aug 2015 11:36:17 +1000

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in:

  drivers/cpufreq/exynos-cpufreq.c

between commit:

  966f2a71a92d ("cpufreq: exynos: remove Exynos4x12 specific cpufreq driver support")

from the samsung tree and commit:

  62c3f2fddd43 ("cpufreq: exynos: Fix for memory leak in case SoC name does not match")

from the pm tree.

I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]