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

2014-05-12 Thread Stephen Rothwell
Hi Rob, Today's linux-next merge of the dt-rh tree got a conflict in drivers/of/selftest.c between commit 82c0f5897a87 ("of: selftest: add deferred probe interrupt test") from Linus' tree and commit ae7c987bc3a7 ("of/selftest: add testcase for nodes with same name and address") from the dt-rh tree

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

2012-10-01 Thread Stephen Rothwell
Hi Rob, Today's linux-next merge of the dt-rh tree got a conflict in drivers/of/base.c include/linux/of.h between commit 3296193d1421 ("dt: introduce for_each_available_child_of_node, of_get_next_available_child") from Linus' tree and commit 9c19761a7ecd ("dt: introduce of_get_child_by_name to get