commit | 66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d | [log] [tgz] |
---|---|---|
author | Grant Likely <grant.likely@linaro.org> | Mon Nov 24 14:50:07 2014 +0000 |
committer | Grant Likely <grant.likely@linaro.org> | Mon Nov 24 14:50:07 2014 +0000 |
tree | d72f980f64b88ea4e976215a503fcb038e02f981 | |
parent | 2d0747c4b68be8eb8ccfa2c538f2f5dd2ea89094 [diff] | |
parent | 5d01410fe4d92081f349b013a2e7a95429e4f2c9 [diff] |
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