Merge commit 'origin/master' into next

Documentation/ABI/testing/ima_policy

Documentation/cpu-freq/governors.txt

Documentation/fault-injection/fault-injection.txt

MAINTAINERS

Makefile

arch/arm/Kconfig

arch/arm/Makefile

arch/arm/mach-mx25/clock.c

arch/arm/mach-mx25/mx25pdk.c

arch/arm/mach-mx3/mx31ads.c

arch/arm/mach-omap2/gpmc.c

arch/arm/mach-omap2/irq.c

arch/arm/mach-omap2/mmc-twl4030.c

arch/arm/mach-omap2/mux.c

arch/arm/mach-omap2/mux34xx.c

arch/arm/mach-omap2/serial.c

arch/arm/mach-realview/realview_pbx.c

arch/arm/mm/proc-arm6_7.S

arch/arm/plat-mxc/audmux-v2.c

arch/arm/plat-mxc/include/mach/board-mx31lite.h