From: Grant Likely <grant.likely@linaro.org>
Date: Mon, 11 Aug 2014 13:06:23 +0000 (+0100)
Subject: Merge branch 'devicetree/next-overlay' into devicetree/next
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~69^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=663d3f7c2e5e1b018a4c53277ccfde40329d98ca;p=pandora-kernel.git

Merge branch 'devicetree/next-overlay' into devicetree/next

Conflicts:
	drivers/of/testcase-data/testcases.dts
---

663d3f7c2e5e1b018a4c53277ccfde40329d98ca
Reading git-diff-tree failed