Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree

2013-04-17 Thread Mauro Carvalho Chehab
Em Tue, 16 Apr 2013 21:23:59 +0200 Samuel Ortiz escreveu: > On Tue, Apr 16, 2013 at 09:25:45AM -0700, Andrey Smirnov wrote: > > On Tue, Apr 16, 2013 at 6:51 AM, Samuel Ortiz wrote: > > > Hi Mauro, > > > > > > On Wed, Apr 10, 2013 at 06:48:28AM -0300, Mauro Carvalho Chehab wrote: > > >> Em Wed, 1

Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree

2013-04-16 Thread Samuel Ortiz
On Tue, Apr 16, 2013 at 09:25:45AM -0700, Andrey Smirnov wrote: > On Tue, Apr 16, 2013 at 6:51 AM, Samuel Ortiz wrote: > > Hi Mauro, > > > > On Wed, Apr 10, 2013 at 06:48:28AM -0300, Mauro Carvalho Chehab wrote: > >> Em Wed, 10 Apr 2013 08:42:53 +0200 > >> Samuel Ortiz escreveu: > >> > >> > Hi St

Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree

2013-04-16 Thread Andrey Smirnov
On Tue, Apr 16, 2013 at 6:51 AM, Samuel Ortiz wrote: > Hi Mauro, > > On Wed, Apr 10, 2013 at 06:48:28AM -0300, Mauro Carvalho Chehab wrote: >> Em Wed, 10 Apr 2013 08:42:53 +0200 >> Samuel Ortiz escreveu: >> >> > Hi Stephen, >> > >> > On Wed, Apr 10, 2013 at 01:48:13PM +1000, Stephen Rothwell wrot

Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree

2013-04-16 Thread Mauro Carvalho Chehab
Em 16-04-2013 10:51, Samuel Ortiz escreveu: Hi Mauro, On Wed, Apr 10, 2013 at 06:48:28AM -0300, Mauro Carvalho Chehab wrote: Em Wed, 10 Apr 2013 08:42:53 +0200 Samuel Ortiz escreveu: Hi Stephen, On Wed, Apr 10, 2013 at 01:48:13PM +1000, Stephen Rothwell wrote: Hi Samuel, Today's linux-nex

Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree

2013-04-16 Thread Samuel Ortiz
Hi Mauro, On Wed, Apr 10, 2013 at 06:48:28AM -0300, Mauro Carvalho Chehab wrote: > Em Wed, 10 Apr 2013 08:42:53 +0200 > Samuel Ortiz escreveu: > > > Hi Stephen, > > > > On Wed, Apr 10, 2013 at 01:48:13PM +1000, Stephen Rothwell wrote: > > > Hi Samuel, > > > > > > Today's linux-next merge of th

Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree

2013-04-10 Thread Samuel Ortiz
Hi Mauro, On Wed, Apr 10, 2013 at 06:48:28AM -0300, Mauro Carvalho Chehab wrote: > Em Wed, 10 Apr 2013 08:42:53 +0200 > Samuel Ortiz escreveu: > > > Hi Stephen, > > > > On Wed, Apr 10, 2013 at 01:48:13PM +1000, Stephen Rothwell wrote: > > > Hi Samuel, > > > > > > Today's linux-next merge of th

Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree

2013-04-10 Thread Mauro Carvalho Chehab
Em Wed, 10 Apr 2013 08:42:53 +0200 Samuel Ortiz escreveu: > Hi Stephen, > > On Wed, Apr 10, 2013 at 01:48:13PM +1000, Stephen Rothwell wrote: > > Hi Samuel, > > > > Today's linux-next merge of the mfd tree got a conflict in > > drivers/mfd/Kconfig between commit 3f8ec5df11aa ("[media] mfd: Add

Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree

2013-04-09 Thread Samuel Ortiz
Hi Stephen, On Wed, Apr 10, 2013 at 01:48:13PM +1000, Stephen Rothwell wrote: > Hi Samuel, > > Today's linux-next merge of the mfd tree got a conflict in > drivers/mfd/Kconfig between commit 3f8ec5df11aa ("[media] mfd: Add header > files and Kbuild plumbing for SI476x MFD core") from the v4l-dvb

linux-next: manual merge of the mfd tree with the v4l-dvb tree

2013-04-09 Thread Stephen Rothwell
Hi Samuel, Today's linux-next merge of the mfd tree got a conflict in drivers/mfd/Kconfig between commit 3f8ec5df11aa ("[media] mfd: Add header files and Kbuild plumbing for SI476x MFD core") from the v4l-dvb tree and commit ab85b120e692 ("mfd: Kconfig alphabetical re-ordering") from the mfd tree.