Merge remote-tracking branch 'lsk/v3.10/topic/libfdt' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 24 Jul 2014 21:54:49 +0000 (22:54 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 24 Jul 2014 21:54:49 +0000 (22:54 +0100)
commitbcddae4453f74e9d1dbc8db78c5c9bc552c600cb
tree44f433cdce0aea74d1098967ff28454e512f777f
parentbf3738e51576cd0cd8c59ef611734cc423323563
parentfc40eed01c76797b6f71c982a782cef2d6ab48a6
Merge remote-tracking branch 'lsk/v3.10/topic/libfdt' into linux-linaro-lsk

Conflicts:
drivers/of/fdt.c
arch/arm/mach-vexpress/platsmp.c
arch/powerpc/kernel/prom.c
arch/powerpc/platforms/pseries/setup.c
arch/xtensa/kernel/setup.c
drivers/of/base.c
drivers/of/fdt.c
include/linux/of.h
lib/Makefile