Re: linux-next: manual merge of the char-misc tree with the sound-asoc tree

2013-01-28 Thread Mark Brown
On Mon, Jan 28, 2013 at 09:54:44PM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the char-misc tree got a conflict in > include/linux/mfd/arizona/pdata.h between commit c94aa30edac4 ("ASoC: > arizona: Allow number of channels clocked to be restricted") from the > sound-asoc tree and

Re: linux-next: manual merge of the char-misc tree with the sound-asoc tree

2012-11-26 Thread Greg KH
On Mon, Nov 26, 2012 at 07:42:29PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in > drivers/misc/atmel-ssc.c between commit 5c86ac695c7e ("ASoC: atmel-ssc: > use module_platform_driver macro") from the sound-asoc tree and commit > 2d6b