Merge branch 'master'

MAINTAINERS

Makefile

arch/arm/kernel/vmlinux.lds.S

arch/arm/mach-l7200/core.c

arch/arm/mach-pxa/corgi_lcd.c

arch/arm/mach-pxa/generic.c

arch/arm/mach-pxa/spitz.c

arch/arm/mach-s3c2410/Kconfig

arch/m32r/kernel/smp.c

arch/mips/pci/fixup-tb0226.c

arch/ppc64/kernel/pmac_setup.c

arch/sparc64/kernel/pci_iommu.c

arch/sparc64/kernel/pci_psycho.c

arch/sparc64/kernel/pci_sabre.c

arch/sparc64/kernel/pci_schizo.c

arch/sparc64/kernel/smp.c

arch/sparc64/mm/ultra.S

arch/sparc64/prom/misc.c

drivers/acpi/event.c

drivers/char/mbcs.c