]> git.openfabrics.org - ~emulex/infiniband.git/commit
projects / ~emulex / infiniband.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2d0747c 5d01410)
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)
commit66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d
treed72f980f64b88ea4e976215a503fcb038e02f981tree | snapshot
parent2d0747c4b68be8eb8ccfa2c538f2f5dd2ea89094commit | diff
parent5d01410fe4d92081f349b013a2e7a95429e4f2c9commit | 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
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
Emulex OneConnect RDMA Driver