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

2015-08-16 Thread Stephen Rothwell
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 le

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

2014-05-21 Thread Kukjin Kim
Rafael J. Wysocki wrote: > > On Tuesday, May 20, 2014 09:27:58 AM Kukjin Kim wrote: > > Rafael J. Wysocki wrote: > > > > > > On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote: > > > > > > > > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og > > > > Content-Type: text/plain; charset=US-ASCII > > > > Content

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

2014-05-20 Thread Rafael J. Wysocki
On Tuesday, May 20, 2014 09:27:58 AM Kukjin Kim wrote: > Rafael J. Wysocki wrote: > > > > On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote: > > > > > > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og > > > Content-Type: text/plain; charset=US-ASCII > > > Content-Transfer-Encoding: quoted-printable > > >

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

2014-05-19 Thread Kukjin Kim
Rafael J. Wysocki wrote: > > On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote: > > > > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og > > Content-Type: text/plain; charset=US-ASCII > > Content-Transfer-Encoding: quoted-printable > > > > Hi Rafael, > > > > Today's linux-next merge of the pm tree got conf

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

2014-05-19 Thread Rafael J. Wysocki
On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote: > > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og > Content-Type: text/plain; charset=US-ASCII > Content-Transfer-Encoding: quoted-printable > > Hi Rafael, > > Today's linux-next merge of the pm tree got conflicts in > drivers/cpufreq/exynos-cpufreq.c

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

2014-05-18 Thread Stephen Rothwell
Hi Rafael, Today's linux-next merge of the pm tree got conflicts in drivers/cpufreq/exynos-cpufreq.c and drivers/cpufreq/exynos-cpufreq.h between commit 2b07f4085479 ("cpufreq: exynos: Fix the compile error") from the samsung tree and commit e5eaa445b0dc ("cpufreq: exynos: Use dev_err/info functio