Merge branch 'master' into upstream-fixes

MAINTAINERS

arch/alpha/lib/strncpy.S

arch/arm/configs/ep93xx_defconfig

arch/arm/configs/ixp2000_defconfig

arch/arm/configs/ixp23xx_defconfig

arch/arm/kernel/setup.c

arch/arm/mach-ixp4xx/common.c

arch/parisc/Kconfig

arch/parisc/defconfig

arch/parisc/kernel/asm-offsets.c

arch/parisc/kernel/cache.c

arch/parisc/kernel/entry.S

arch/parisc/kernel/head.S

arch/parisc/kernel/init_task.c

arch/parisc/kernel/pacache.S

arch/parisc/kernel/sys_parisc.c

arch/parisc/kernel/syscall.S

arch/parisc/kernel/syscall_table.S

arch/parisc/kernel/vmlinux.lds.S

arch/parisc/mm/fault.c