Merge branch 'linus' into x86/pat

2026-09-24 18:16:04 +00:00 · 2008-05-19 09:23:07 +02:00 · 2008-05-19 09:23:07 +02:00 · a8ac1ae3a2
commit a8ac1ae3a2
parent b4ef290d7c b8291ad07a
105 changed files with 2743 additions and 826 deletions
--- a/4
+++ b/4
--- a/2
+++ b/2
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
--- a/arch/arm/kernel/arthur.c
+++ b/arch/arm/kernel/arthur.c
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
--- a/arch/arm/mach-omap2/cm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-34xx.h
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
--- a/arch/arm/mach-omap2/prm.h
+++ b/arch/arm/mach-omap2/prm.h
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
--- a/arch/arm/mach-pxa/colibri.c
+++ b/arch/arm/mach-pxa/colibri.c
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
--- a/arch/arm/mm/proc-arm940.S
+++ b/arch/arm/mm/proc-arm940.S
--- a/arch/arm/mm/proc-arm946.S
+++ b/arch/arm/mm/proc-arm946.S
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
--- a/arch/powerpc/platforms/pasemi/misc.c
+++ b/arch/powerpc/platforms/pasemi/misc.c
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
--- a/drivers/char/snsc_event.c
+++ b/drivers/char/snsc_event.c
--- a/drivers/char/vme_scc.c
+++ b/drivers/char/vme_scc.c
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
--- a/drivers/input/serio/hp_sdc_mlc.c
+++ b/drivers/input/serio/hp_sdc_mlc.c
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
--- a/drivers/media/video/cs5345.c
+++ b/drivers/media/video/cs5345.c
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
--- a/drivers/media/video/m52790.c
+++ b/drivers/media/video/m52790.c
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
--- a/drivers/media/video/saa717x.c
+++ b/drivers/media/video/saa717x.c
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
--- a/drivers/media/video/vp27smpx.c
+++ b/drivers/media/video/vp27smpx.c
--- a/drivers/media/video/wm8739.c
+++ b/drivers/media/video/wm8739.c
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
--- a/fs/befs/endian.h
+++ b/fs/befs/endian.h
--- a/include/asm-arm/arch-omap/common.h
+++ b/include/asm-arm/arch-omap/common.h
--- a/include/asm-arm/arch-omap/control.h
+++ b/include/asm-arm/arch-omap/control.h
--- a/include/asm-arm/arch-omap/mmc.h
+++ b/include/asm-arm/arch-omap/mmc.h
--- a/include/asm-arm/arch-sa1100/irqs.h
+++ b/include/asm-arm/arch-sa1100/irqs.h
--- a/include/asm-arm/hardware/locomo.h
+++ b/include/asm-arm/hardware/locomo.h
--- a/include/asm-m68k/bug.h
+++ b/include/asm-m68k/bug.h
--- a/Show more
+++ b/Show more