Merge branch 'linus' into sched/urgent

Documentation/cpusets.txt

Documentation/hwmon/sysfs-interface

MAINTAINERS

Makefile

arch/alpha/Makefile

arch/alpha/kernel/core_t2.c

arch/alpha/kernel/pci.c

arch/alpha/kernel/traps.c

arch/ia64/sn/kernel/sn2/sn2_smp.c

arch/powerpc/kernel/vdso.c

arch/x86/kernel/geode_32.c

arch/x86/kernel/process_32.c

arch/x86/kernel/process_64.c

arch/x86/kernel/setup_32.c

arch/x86/kernel/tsc_32.c

drivers/acpi/ac.c

drivers/acpi/video.c

drivers/ata/Kconfig

drivers/ata/ahci.c

drivers/ata/ata_piix.c