Merge branch 'devicetree/next-overlay' into devicetree/next
authorGrant Likely <grant.likely@linaro.org>
Mon, 11 Aug 2014 13:06:23 +0000 (14:06 +0100)
committerGrant Likely <grant.likely@linaro.org>
Mon, 11 Aug 2014 13:06:23 +0000 (14:06 +0100)
commit663d3f7c2e5e1b018a4c53277ccfde40329d98ca
treea3afcc2d8fe682bdcc4c2e39b47ab3987b38c69a
parentb775e642bf958a02210ac4d4edd1a1b7067c49fa
parentb6ae5dc54b0a5c542d06d46b9083ceb70bf7e083
Merge branch 'devicetree/next-overlay' into devicetree/next

Conflicts:
drivers/of/testcase-data/testcases.dts
drivers/of/Makefile
drivers/of/base.c
drivers/of/selftest.c
drivers/of/testcase-data/testcases.dts
include/linux/of.h