Merge branch 'linus_origin' into hotfixes

Documentation/00-INDEX

Documentation/cpuidle/core.txt

Documentation/cpuidle/driver.txt

Documentation/cpuidle/governor.txt

Documentation/cpuidle/sysfs.txt

MAINTAINERS

arch/alpha/kernel/osf_sys.c

arch/blackfin/kernel/traps.c

arch/cris/arch-v10/lib/memset.c

arch/cris/arch-v32/lib/memset.c

arch/m68knommu/platform/5206/Makefile

arch/m68knommu/platform/5206e/Makefile

arch/m68knommu/platform/520x/Makefile

arch/m68knommu/platform/523x/Makefile

arch/m68knommu/platform/5249/Makefile

arch/m68knommu/platform/5272/Makefile

arch/m68knommu/platform/527x/Makefile

arch/m68knommu/platform/528x/Makefile

arch/m68knommu/platform/5307/Makefile

arch/m68knommu/platform/532x/Makefile