Merge branch 'master' into sh/smp

Documentation/filesystems/afs.txt

Documentation/filesystems/proc.txt

Documentation/power/runtime_pm.txt

Documentation/video4linux/CARDLIST.em28xx

Documentation/video4linux/CARDLIST.saa7134

MAINTAINERS

Makefile

REPORTING-BUGS

arch/arm/configs/rx51_defconfig

arch/arm/include/asm/device.h

arch/arm/include/asm/setup.h

arch/arm/mach-ixp4xx/include/mach/io.h

arch/arm/mach-mx3/mx31moboard-devboard.c

arch/arm/mach-mx3/mx31moboard-marxbot.c

arch/arm/mach-mx3/mx31moboard.c

arch/arm/mach-mx3/pcm037_eet.c

arch/arm/mach-omap2/board-2430sdp.c

arch/arm/mach-omap2/board-3430sdp.c

arch/arm/mach-omap2/board-4430sdp.c

arch/arm/mach-omap2/board-apollon.c