Merge branch 'origin'

Documentation/DocBook/tracepoint.tmpl

Documentation/kernel-parameters.txt

MAINTAINERS

arch/alpha/include/asm/cache.h

arch/alpha/kernel/err_marvel.c

arch/alpha/kernel/perf_event.c

arch/alpha/kernel/proto.h

arch/alpha/kernel/sys_cabriolet.c

arch/alpha/kernel/sys_takara.c

arch/arm/Kconfig

arch/h8300/include/asm/atomic.h

arch/h8300/include/asm/system.h

arch/h8300/kernel/sys_h8300.c

arch/h8300/kernel/traps.c

arch/m68knommu/kernel/vmlinux.lds.S

arch/powerpc/kernel/head_64.S

arch/powerpc/kernel/misc_32.S

arch/powerpc/kernel/time.c

arch/powerpc/platforms/83xx/mpc837x_mds.c

arch/powerpc/platforms/85xx/mpc85xx_mds.c