linux-next: manual merge of the devicetree tree with the powerpc tree

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
arch/powerpc/platforms/iseries/Kconfig between commit 3d066d77cf46
("powerpc: remove CONFIG_PPC_ISERIES from the architecture Kconfig
files") from the powerpc tree and commit 0f22dd395fc4 ("of: Only compile
OF_DYNAMIC on PowerPC pseries and iseries") from the devicetree tree.

The former commit removes the file (as the legacy iSeries platform is
being removed), so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

On Mon, Feb 27, 2012 at 7:06 PM, Stephen Rothwell [off-list ref] wr=
ote:

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
arch/powerpc/platforms/iseries/Kconfig between commit 3d066d77cf46
("powerpc: remove CONFIG_PPC_ISERIES from the architecture Kconfig
files") from the powerpc tree and commit 0f22dd395fc4 ("of: Only compile
OF_DYNAMIC on PowerPC pseries and iseries") from the devicetree tree.

The former commit removes the file (as the legacy iSeries platform is
being removed), so I did that.

Okay, thanks.

g.

--
Cheers,
Stephen Rothwell =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0sfr@canb.auug.org=

.au



--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.