lkml.org 
[lkml]   [2011]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the devicetree tree with Linus' tree
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/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-08-05 04:17    [W:0.022 / U:1.348 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site