Merge tag 'v3.14-rc5' into HEAD

author Grant Likely <grant.likely@linaro.org>

Tue, 4 Mar 2014 08:44:10 +0000 (16:44 +0800)

committer Grant Likely <grant.likely@linaro.org>

Tue, 4 Mar 2014 08:44:10 +0000 (16:44 +0800)
author Grant Likely <grant.likely@linaro.org>
Tue, 4 Mar 2014 08:44:10 +0000 (16:44 +0800)
committer Grant Likely <grant.likely@linaro.org>
Tue, 4 Mar 2014 08:44:10 +0000 (16:44 +0800)
diff --cc Makefile
Simple merge
diff --cc arch/arm/boot/dts/Makefile
Simple merge
diff --cc drivers/of/address.c
Simple merge
diff --cc drivers/of/base.c
Simple merge
diff --cc include/linux/of.h
Simple merge
diff --cc scripts/Makefile.lib
Simple merge
author	Grant Likely <grant.likely@linaro.org>
	Tue, 4 Mar 2014 08:44:10 +0000 (16:44 +0800)
committer	Grant Likely <grant.likely@linaro.org>
	Tue, 4 Mar 2014 08:44:10 +0000 (16:44 +0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/of/address.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/of/base.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/of.h	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.lib	patch \|	diff1 \|	diff2 \|	blob \| history