git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

author	Grant Likely <grant.likely@linaro.org>
	Mon, 24 Nov 2014 14:50:07 +0000 (14:50 +0000)
committer	Grant Likely <grant.likely@linaro.org>
	Mon, 24 Nov 2014 14:50:07 +0000 (14:50 +0000)
commit	66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d
tree	d72f980f64b88ea4e976215a503fcb038e02f981	tree \| snapshot (tar.gz zip)
parent	2d0747c4b68be8eb8ccfa2c538f2f5dd2ea89094	commit \| diff
parent	5d01410fe4d92081f349b013a2e7a95429e4f2c9	commit \| 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

RSS Atom

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