On 11/01/2013 12:20 AM, Stephen Rothwell wrote:
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in
arch/powerpc/include/asm/prom.h between commit a3e31b458844 (of:
Move definition of of_find_next_cache_node into common code) from
the powerpc tree and commit 0c3f061c195c
Hi Rob,
On Fri, 01 Nov 2013 17:24:42 -0500 Rob Herring robherri...@gmail.com wrote:
On 11/01/2013 12:20 AM, Stephen Rothwell wrote:
Today's linux-next merge of the dt-rh tree got a conflict in
arch/powerpc/include/asm/prom.h between commit a3e31b458844 (of:
Move definition of
On Fri, 2013-11-01 at 17:24 -0500, Rob Herring wrote:
On 11/01/2013 12:20 AM, Stephen Rothwell wrote:
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in
arch/powerpc/include/asm/prom.h between commit a3e31b458844 (of:
Move definition of of_find_next_cache_node into
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in
arch/powerpc/include/asm/prom.h between commit a3e31b458844 (of: Move
definition of of_find_next_cache_node into common code) from the powerpc
tree and commit 0c3f061c195c (of: implement of_node_to_nid as a weak
function) from
