linux-next: manual merge of the devicetree tree with Linus' tree

Stephen Rothwell
2011-08-05T02:14:04Z

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
drivers/of/base.c between commit fe55c1844a1c ("Revert "dt: add
of_alias_scan and of_alias_get_id"") from Linus' tree and commit
79787f21b37b ("drivers/of: Fix sparc build failure caused by
of_alias_scan") from the devicetree tree.

Given the discussion on other threads, I used Linus' version.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]