Merge branch 'master' into upstream

Documentation/serial/driver

MAINTAINERS

Makefile

arch/alpha/kernel/alpha_ksyms.c

arch/alpha/kernel/process.c

arch/alpha/kernel/smp.c

arch/alpha/kernel/sys_titan.c

arch/arm/Kconfig.debug

arch/arm/mach-ixp23xx/core.c

arch/arm/mach-ixp4xx/Kconfig

arch/arm/mach-pxa/mainstone.c

arch/arm/mach-s3c2410/Kconfig

arch/arm/mm/mm-armv.c

arch/arm/mm/proc-xsc3.S

arch/i386/kernel/acpi/boot.c

arch/i386/mach-generic/probe.c

arch/mips/Kconfig

arch/mips/au1000/common/irq.c

arch/mips/au1000/common/prom.c

arch/mips/au1000/common/sleeper.S