Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
	drivers/of/of_net.c

diff --cc Makefile
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/mach-mvebu/Kconfig
Simple merge

diff --cc drivers/of/address.c
Simple merge

diff --cc drivers/of/base.c
Simple merge

diff --cc drivers/of/of_net.c
Simple merge

diff --cc include/linux/of.h
Simple merge

diff --cc scripts/Makefile.lib
Simple merge