linux-next: manual merge of the devicetree tree with the arm-soctree

From: Stephen Rothwell
Date: Thu Jan 16 2014 - 22:11:57 EST

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts between commit
261e7735d0ed ("ARM: kirkwood: NETGEAR ReadyNAS Duo v2 .dts cleanup") from
the arm-soc tree and commit 40aad3c1a9b6 ("dt/bindings: Remove all
references to device_type "ethernet-phy"") from the devicetree tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index 4d2a8db9ab77,00c0669b1b8c..000000000000
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@@ -241,8 -210,7 +241,7 @@@
&mdio {
status = "okay";

- ethphy0: ethernet-phy@0 {
+ ethphy0: ethernet-phy@0 { /* Marvell 88E1318 */
- device_type = "ethernet-phy";
reg = <0>;

Attachment: pgp00000.pgp
Description: PGP signature