Subject: linux-next: manual merge of the genesis tree with the sh tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 26 May 2010 11:23:31 +1000

Hi Paul,

Today's linux-next merge of the genesis tree got a conflict in
include/linux/serial_sci.h between commit
14baf9d7f275f0bbf42c1216ff1eef1109ca42ba ("serial: sh-sci: fix up serial
DMA build") from the sh tree and commit
927a7c9c1793def3a55d60c926d3945528e6bf1b ("dmaengine: shdma: Enable on
SH-Mobile ARM") from the genesis tree.

I used the version from the sh tree (i.e. no "#ifdef
CONFIG_SERIAL_SH_SCI_DMA" around the include of linux/sh_dma.h).
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/