Merge branch 'master'

arch/arm/kernel/sys_arm.c

arch/arm/kernel/traps.c

arch/arm/mach-imx/generic.c

arch/arm/mach-imx/mx1ads.c

arch/sparc/kernel/time.c

arch/sparc/mm/srmmu.c

arch/um/include/registers.h

arch/um/include/sysdep-x86_64/ptrace.h

arch/um/kernel/sysrq.c

arch/um/os-Linux/sys-i386/registers.c

arch/um/os-Linux/sys-x86_64/registers.c

arch/um/sys-i386/sysrq.c

arch/um/sys-i386/user-offsets.c

arch/x86_64/kernel/head.S

drivers/infiniband/hw/mthca/mthca_main.c

drivers/infiniband/ulp/ipoib/ipoib_main.c

drivers/net/tokenring/ibmtr.c

drivers/net/wireless/orinoco.c

drivers/scsi/megaraid/megaraid_sas.c

drivers/serial/sunsu.c