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

* Stephen Rothwell s...@canb.auug.org.au [100817 05:14]: Hi all, Today's linux-next merge of the sound-asoc tree got a conflict in arch/arm/mach-omap2/board-n8x0.c between commits 1c37553eb1778802f0e7b6730df36542752e801e (omap: n8x0: Cleanup i2c1 and menelaus registration) and

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

On Tue, 17 Aug 2010 09:15:59 +0300 Tony Lindgren t...@atomide.com wrote: * Stephen Rothwell s...@canb.auug.org.au [100817 05:14]: Hi all, Today's linux-next merge of the sound-asoc tree got a conflict in arch/arm/mach-omap2/board-n8x0.c between commits

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

* Jarkko Nikula jhnik...@gmail.com [100817 09:27]: On Tue, 17 Aug 2010 09:15:59 +0300 Tony Lindgren t...@atomide.com wrote: * Stephen Rothwell s...@canb.auug.org.au [100817 05:14]: Hi all, Today's linux-next merge of the sound-asoc tree got a conflict in

linux-next: manual merge of the sound-asoc tree with the omap tree

Hi all, Today's linux-next merge of the sound-asoc tree got a conflict in arch/arm/mach-omap2/board-n8x0.c between commits 1c37553eb1778802f0e7b6730df36542752e801e (omap: n8x0: Cleanup i2c1 and menelaus registration) and 69be0f6f4b8e3be992ab6a333a3a82e043784c52 (omap: n8x0: Register i2c2 and add