Re: linux-next: manual merge of the slave-dma tree with the renesas tree

On Wed, Mar 18, 2015 at 12:03:22PM +1100, Stephen Rothwell wrote: > Hi Vinod, > > Today's linux-next merge of the slave-dma tree got a conflict in > arch/arm/mach-shmobile/board-ape6evm.c between commit 9d07d414d4c3 > ("ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform") from the > renesas t

linux-next: manual merge of the slave-dma tree with the renesas tree

Hi Vinod, Today's linux-next merge of the slave-dma tree got a conflict in arch/arm/mach-shmobile/board-ape6evm.c between commit 9d07d414d4c3 ("ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform") from the renesas tree and commit c078c62a7528 ("mmc: sh_mobile_sdhi: remove sh_mobile_sdhi_info