Merge branch 'linus' into x86/cleanups

Conflicts: arch/x86/kernel/reboot.c
2026-09-24 18:16:04 +00:00 · 2009-01-02 22:41:36 +01:00 · 2009-01-02 22:41:36 +01:00 · 923a789b49
commit 923a789b49
parent 103ceffb95 b840d79631
2762 changed files with 234453 additions and 137135 deletions
--- a/Documentation/ABI/testing/sysfs-class-uwb_rc
+++ b/Documentation/ABI/testing/sysfs-class-uwb_rc
--- a/Documentation/RCU/00-INDEX
+++ b/Documentation/RCU/00-INDEX
--- a/Documentation/RCU/trace.txt
+++ b/Documentation/RCU/trace.txt
--- a/Documentation/arm/pxa/mfp.txt
+++ b/Documentation/arm/pxa/mfp.txt
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
--- a/Documentation/dvb/technisat.txt
+++ b/Documentation/dvb/technisat.txt
--- a/Documentation/fb/pxafb.txt
+++ b/Documentation/fb/pxafb.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/devpts.txt
+++ b/Documentation/filesystems/devpts.txt
--- a/Documentation/filesystems/files.txt
+++ b/Documentation/filesystems/files.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/filesystems/xfs.txt
+++ b/Documentation/filesystems/xfs.txt
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
--- a/Documentation/lockstat.txt
+++ b/Documentation/lockstat.txt
--- a/Documentation/scsi/cxgb3i.txt
+++ b/Documentation/scsi/cxgb3i.txt
--- a/Documentation/usb/wusb-cbaf
+++ b/Documentation/usb/wusb-cbaf
--- a/Documentation/video4linux/API.html
+++ b/Documentation/video4linux/API.html
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
--- a/Documentation/video4linux/README.cx88
+++ b/Documentation/video4linux/README.cx88
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
--- a/26
+++ b/26
--- a/9
+++ b/9
--- a/arch/Kconfig
+++ b/arch/Kconfig
--- a/arch/alpha/include/asm/io.h
+++ b/arch/alpha/include/asm/io.h
--- a/arch/alpha/include/asm/smp.h
+++ b/arch/alpha/include/asm/smp.h
--- a/arch/alpha/kernel/init_task.c
+++ b/arch/alpha/kernel/init_task.c
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
--- a/arch/arm/boot/compressed/head-clps7500.S
+++ b/arch/arm/boot/compressed/head-clps7500.S
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
--- a/arch/arm/common/clkdev.c
+++ b/arch/arm/common/clkdev.c
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
--- a/arch/arm/configs/eseries_pxa_defconfig
+++ b/arch/arm/configs/eseries_pxa_defconfig
--- a/arch/arm/configs/h5000_defconfig
+++ b/arch/arm/configs/h5000_defconfig
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
--- a/arch/arm/configs/ks8695_defconfig
+++ b/arch/arm/configs/ks8695_defconfig
--- a/arch/arm/configs/mx31moboard_defconfig
+++ b/arch/arm/configs/mx31moboard_defconfig
--- a/arch/arm/configs/mx31pdk_defconfig
+++ b/arch/arm/configs/mx31pdk_defconfig
--- a/arch/arm/configs/neocore926_defconfig
+++ b/arch/arm/configs/neocore926_defconfig
--- a/arch/arm/configs/netx_defconfig
+++ b/arch/arm/configs/netx_defconfig
--- a/arch/arm/configs/omap3_pandora_defconfig
+++ b/arch/arm/configs/omap3_pandora_defconfig
--- a/arch/arm/configs/omap_ldp_defconfig
+++ b/arch/arm/configs/omap_ldp_defconfig
--- a/arch/arm/configs/picotux200_defconfig
+++ b/arch/arm/configs/picotux200_defconfig
--- a/arch/arm/configs/realview-smp_defconfig
+++ b/arch/arm/configs/realview-smp_defconfig
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
--- a/arch/arm/configs/s3c6400_defconfig
+++ b/arch/arm/configs/s3c6400_defconfig
--- a/arch/arm/configs/w90p910_defconfig
+++ b/arch/arm/configs/w90p910_defconfig
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
--- a/arch/arm/include/asm/clkdev.h
+++ b/arch/arm/include/asm/clkdev.h
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
--- a/arch/arm/include/asm/hardware/iomd.h
+++ b/arch/arm/include/asm/hardware/iomd.h
--- a/arch/arm/include/asm/hardware/vic.h
+++ b/arch/arm/include/asm/hardware/vic.h
--- a/arch/arm/include/asm/hwcap.h
+++ b/arch/arm/include/asm/hwcap.h
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
--- a/arch/arm/include/asm/irq.h
+++ b/arch/arm/include/asm/irq.h
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
--- a/arch/arm/include/asm/mmu_context.h
+++ b/arch/arm/include/asm/mmu_context.h
--- a/arch/arm/include/asm/mtd-xip.h
+++ b/arch/arm/include/asm/mtd-xip.h
--- a/arch/arm/include/asm/page.h
+++ b/arch/arm/include/asm/page.h
--- a/arch/arm/include/asm/processor.h
+++ b/arch/arm/include/asm/processor.h
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
--- a/arch/arm/include/asm/smp.h
+++ b/arch/arm/include/asm/smp.h
--- a/arch/arm/include/asm/string.h
+++ b/arch/arm/include/asm/string.h
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
--- a/arch/arm/kernel/init_task.c
+++ b/arch/arm/kernel/init_task.c
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/kernel/thumbee.c
+++ b/arch/arm/kernel/thumbee.c
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
--- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S
--- a/arch/arm/mach-aaec2000/Makefile
+++ b/arch/arm/mach-aaec2000/Makefile
--- a/arch/arm/mach-aaec2000/clock.c
+++ b/arch/arm/mach-aaec2000/clock.c
--- a/arch/arm/mach-aaec2000/clock.h
+++ b/arch/arm/mach-aaec2000/clock.h
--- a/arch/arm/mach-aaec2000/core.c
+++ b/arch/arm/mach-aaec2000/core.c
--- a/Show more
+++ b/Show more