Merge branch into tip/master: 'x86/platform'
# New commits in x86/platform:
801549ed6abe ("x86/platform/olpc-xo1-sci: Convert to platform remove callback returning void")
c741ccfdc0b3 ("x86/platform/olpc-x01-pm: Convert to platform remove callback returning void")
bcc0403eb4c3 ("x86/platform/iris: Convert to platform remove callback returning void")
f87136c05714 ("x86/of: Change x86_dtb_parse_smp_config() to static")
85900d061884 ("x86/of: Map NUMA node to CPUs as per DeviceTree")
222408cde4d0 ("x86/of: Set the parse_smp_cfg for all the DeviceTree platforms by default")
fe5e6b599fbc ("x86/hyperv/vtl: Correct x86_init.mpparse.parse_smp_cfg assignment")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
