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