Merge branch 'devicetree/next-console' into devicetree/next
authorGrant Likely <grant.likely@linaro.org>
Mon, 11 Aug 2014 13:03:08 +0000 (14:03 +0100)
committerGrant Likely <grant.likely@linaro.org>
Mon, 11 Aug 2014 13:03:08 +0000 (14:03 +0100)

Trivial merge