On 01.10.2014 03:22, Stephen Rothwell wrote:
Today's linux-next merge of the net-next tree got a conflict in arch/arm/boot/dts/berlin2q-marvell-dmp.dts between commit 461316fca705 ("ARM: berlin: enable the eSATA interface on the BG2Q DMP") from the berlin tree and commit 75215193b975 ("ARM: dts: berlin: enable the Ethernet port on the BG2Q DMP") from the net-next tree.I fixed it up (see below) and can carry the fix as necessary (no action is required).
Looks good to me, Thanks Stephen! Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
