Merge branch 'master' into upstream

CREDITS

Documentation/devices.txt

Documentation/feature-removal-schedule.txt

Documentation/memory-barriers.txt

Documentation/networking/operstates.txt

Documentation/scsi/ChangeLog.megaraid

Documentation/spi/pxa2xx

Documentation/spi/spi-summary

Documentation/watchdog/watchdog-api.txt

MAINTAINERS

Makefile

arch/arm/Kconfig

arch/arm/boot/compressed/misc.c

arch/arm/configs/collie_defconfig

arch/arm/configs/versatile_defconfig

arch/arm/kernel/asm-offsets.c

arch/arm/kernel/dma-isa.c

arch/arm/kernel/head-nommu.S

arch/arm/kernel/head.S

arch/arm/kernel/process.c