From: Grant Likely <grant.likely@linaro.org>
Date: Sun, 29 Mar 2015 07:59:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'robh/for-next' into devicetree/next
X-Git-Tag: omap-for-v4.1/fixes-rc1~103^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2166ca5f3204794e8b59f01c93a0f1564e3e138;p=pandora-kernel.git

Merge remote-tracking branch 'robh/for-next' into devicetree/next

Conflicts:
	drivers/of/unittest.c
---

a2166ca5f3204794e8b59f01c93a0f1564e3e138
Reading git-diff-tree failed