Merge branch 'devicetree/next-reserved-mem' into devicetree/next
authorGrant Likely <grant.likely@linaro.org>
Wed, 19 Mar 2014 15:01:53 +0000 (15:01 +0000)
committerGrant Likely <grant.likely@linaro.org>
Wed, 19 Mar 2014 15:01:53 +0000 (15:01 +0000)

Trivial merge