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)
commitca3992bc0c12e381deb84cd47ec1181a6d34660d
tree162006e862b9d856fdce1b19f0ba117dafb6ca58
parent0829f6d1f69e4f2fae4062987ae6531a9af1a2e3
parent2040b52768ebab6e7bd73af0dc63703269c62f17
Merge branch 'devicetree/next-reserved-mem' into devicetree/next
drivers/of/Kconfig
drivers/of/fdt.c