Merge branch 'master' into upstream

MAINTAINERS

arch/s390/kernel/head31.S

arch/s390/kernel/head64.S

arch/s390/kernel/setup.c

arch/sparc/kernel/devices.c

arch/sparc/kernel/irq.c

arch/sparc/kernel/of_device.c

arch/sparc/kernel/prom.c

arch/sparc/kernel/smp.c

arch/sparc/kernel/sparc_ksyms.c

arch/sparc/kernel/sun4d_smp.c

arch/sparc/kernel/sys_sparc.c

arch/sparc/mm/io-unit.c

arch/sparc/prom/tree.c

arch/sparc64/defconfig

arch/sparc64/kernel/devices.c

arch/sparc64/kernel/of_device.c

arch/sparc64/kernel/prom.c

arch/sparc64/kernel/sparc64_ksyms.c

arch/sparc64/kernel/sys_sparc.c