]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 15274a8 f520a3f)
Merge tag 'v3.18-rc6' into devicetree/next
authorGrant Likely <grant.likely@linaro.org>
Mon, 24 Nov 2014 14:50:07 +0000 (14:50 +0000)
committerGrant Likely <grant.likely@linaro.org>
Mon, 24 Nov 2014 14:50:07 +0000 (14:50 +0000)
commit5e3b5be7016277222bb531d4117bb95debc218aa
treed72f980f64b88ea4e976215a503fcb038e02f981tree | snapshot
parent15274a8e9d73bbde564a2cbef5b885052b4ea2e2commit | diff
parentf520a3fb5f3728a3eee89034d362ea863eb1ce0ccommit | diff
Merge tag 'v3.18-rc6' into devicetree/next

v3.18-rc6 contains an important DT bug fix, 9793e0896b, "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
drivers/of/address.c diff1 | diff2 | blob | history
drivers/of/dynamic.c diff1 | diff2 | blob | history
drivers/of/fdt.c diff1 | diff2 | blob | history
drivers/of/unittest.c diff1 | | blob | history
Linux Kernel Source Tree.