Merge tag 'v3.11-rc7' into devicetree/next
authorGrant Likely <grant.likely@linaro.org>
Wed, 28 Aug 2013 19:18:13 +0000 (20:18 +0100)
committerGrant Likely <grant.likely@linaro.org>
Wed, 28 Aug 2013 19:18:13 +0000 (20:18 +0100)
Linux 3.11-rc7

1  2 
drivers/of/fdt.c

Simple merge