Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Mon, 16 Feb 2015 07:57:48 +0000 (16:57 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 16 Feb 2015 07:57:48 +0000 (16:57 +0900)
commit7710601a8b24a3f77ebdfc7b213c21344c650987
treefbea2187b1d65430356fd4697f8db7433a28f272
parent13beb8851e931b3cfb3403c3a62bfee9ab27a60c
parente60dc703729b117d0b617249bcae373a430ebade
Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk

Conflicts:
arch/powerpc/kernel/prom.c
drivers/of/Kconfig
drivers/of/Makefile
drivers/of/selftest.c
include/linux/of.h
12 files changed:
arch/powerpc/kernel/prom.c
arch/powerpc/mm/numa.c
arch/powerpc/platforms/pseries/hotplug-cpu.c
arch/powerpc/platforms/pseries/hotplug-memory.c
arch/powerpc/platforms/pseries/setup.c
drivers/of/Kconfig
drivers/of/Makefile
drivers/of/base.c
drivers/of/fdt.c
drivers/of/selftest.c
fs/proc/root.c
include/linux/of.h