Re: linux-next: manual merge of the rtc tree with the arm-soc tree

Hi Stephen, On 27/08/2015 at 16:22:29 +1000, Stephen Rothwell wrote : > clock-frequency = <1200>; > }; > > +sound0: sound@0 { > +compatible = "simple-audio-card"; > +simple-audio-card,name = "AM437x-GP-EVM"; > +simple-audio-car

linux-next: manual merge of the rtc tree with the arm-soc tree

Hi Alexandre, Today's linux-next merge of the rtc tree got a conflict in: arch/arm/boot/dts/am437x-gp-evm.dts between commits: d3d92af19e99 ("ARM: dts: am437x-gp-evm: McASP1 node for audio support") cf9a4850e995 ("ARM: dts: am437x-gp-evm: Enable analog audio via simple-card") from the ar