Merge branch 'master'

Documentation/DocBook/kernel-api.tmpl

Documentation/block/biodoc.txt

Documentation/devices.txt

Documentation/feature-removal-schedule.txt

Documentation/oops-tracing.txt

Documentation/usb/bluetooth.txt

arch/arm/Kconfig

arch/arm/boot/compressed/head.S

arch/arm/common/sa1111.c

arch/arm/configs/s3c2410_defconfig

arch/arm/mach-pxa/corgi_lcd.c

arch/arm/mach-realview/core.h

arch/arm/mach-realview/localtimer.c

arch/arm/mach-realview/platsmp.c

arch/arm/mach-s3c2410/mach-bast.c

arch/arm/plat-omap/dmtimer.c

arch/arm/plat-omap/ocpi.c

arch/arm/plat-omap/pm.c

arch/arm/plat-omap/sram-fn.S

arch/i386/kernel/crash.c