From: Grant Likely <grant.likely@linaro.org>
Date: Mon, 24 Nov 2014 14:50:07 +0000 (+0000)
Subject: Merge tag 'v3.18-rc6' into devicetree/next
X-Git-Tag: omap-for-v3.19/fixes-rc1~127^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d;p=pandora-kernel.git

Merge tag 'v3.18-rc6' into devicetree/next

v3.18-rc6 contains an important DT bug fix, c1a2086e2d, "of/selftest:
Fix off-by-one error in removal path" which affects testing of the
overlay patch series. Merge it into the devicetree/next staging branch
so that the overlay patches are applied on top of a known working tree.

Linux 3.18-rc6

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

66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d
Reading git-diff-tree failed