Merge branch 'master' into for-linus

Documentation/ABI/testing/sysfs-bus-pci

Documentation/filesystems/xfs-delayed-logging-design.txt

MAINTAINERS

Makefile

arch/arm/common/sa1111.c

arch/arm/mach-msm/dma.c

arch/arm/mach-nomadik/clock.c

arch/arm/mach-nomadik/clock.h

arch/arm/mach-nomadik/cpu-8815.c

arch/arm/mach-pxa/palmtc.c

arch/arm/mach-pxa/spitz.c

arch/arm/mach-ux500/Makefile

arch/arm/mach-ux500/clock.c

arch/arm/mach-ux500/clock.h

arch/arm/mach-ux500/cpu.c

arch/arm/mm/copypage-feroceon.c

arch/arm/mm/copypage-v4wb.c

arch/arm/mm/copypage-v4wt.c

arch/arm/mm/copypage-xsc3.c

arch/arm/mm/fault.c