Merge branch 'sched/urgent' into sched/core

2026-09-26 18:16:26 +00:00 · 2008-11-07 10:29:58 +01:00 · 2008-11-07 10:29:58 +01:00 · 258594a138
commit 258594a138
parent a87d091434 ca3273f964
197 changed files with 5508 additions and 2959 deletions
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
--- a/Documentation/email-clients.txt
+++ b/Documentation/email-clients.txt
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
--- a/Documentation/io-mapping.txt
+++ b/Documentation/io-mapping.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/2
+++ b/2
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
--- a/arch/arm/kernel/elf.c
+++ b/arch/arm/kernel/elf.c
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
--- a/arch/arm/mm/cache-xsc3l2.c
+++ b/arch/arm/mm/cache-xsc3l2.c
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
--- a/arch/arm/plat-omap/include/mach/entry-macro.S
+++ b/arch/arm/plat-omap/include/mach/entry-macro.S
--- a/arch/arm/plat-omap/include/mach/irqs.h
+++ b/arch/arm/plat-omap/include/mach/irqs.h
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
--- a/arch/x86/include/asm/fixmap_32.h
+++ b/arch/x86/include/asm/fixmap_32.h
--- a/arch/x86/include/asm/highmem.h
+++ b/arch/x86/include/asm/highmem.h
--- a/arch/x86/include/asm/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
--- a/arch/x86/include/asm/voyager.h
+++ b/arch/x86/include/asm/voyager.h
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
--- a/arch/x86/kernel/tlb_32.c
+++ b/arch/x86/kernel/tlb_32.c
--- a/arch/x86/kernel/tlb_64.c
+++ b/arch/x86/kernel/tlb_64.c
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
--- a/arch/x86/mach-voyager/setup.c
+++ b/arch/x86/mach-voyager/setup.c
--- a/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
--- a/arch/x86/mm/iomap_32.c
+++ b/arch/x86/mm/iomap_32.c
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
--- a/block/blk-core.c
+++ b/block/blk-core.c
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
--- a/block/elevator.c
+++ b/block/elevator.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/atl1e/atl1e.h
+++ b/drivers/net/atl1e/atl1e.h
--- a/drivers/net/bnx2x_init.h
+++ b/drivers/net/bnx2x_init.h
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
--- a/drivers/net/ucc_geth_ethtool.c
+++ b/drivers/net/ucc_geth_ethtool.c
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
--- a/drivers/net/wireless/ath5k/desc.c
+++ b/drivers/net/wireless/ath5k/desc.c
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
--- a/drivers/ps3/ps3-lpm.c
+++ b/drivers/ps3/ps3-lpm.c
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
--- a/drivers/staging/echo/echo.c
+++ b/drivers/staging/echo/echo.c
--- a/drivers/staging/me4000/me4000.c
+++ b/drivers/staging/me4000/me4000.c
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
--- a/drivers/video/mb862xx/Makefile
+++ b/drivers/video/mb862xx/Makefile
--- a/drivers/video/mb862xx/mb862xx_reg.h
+++ b/drivers/video/mb862xx/mb862xx_reg.h
--- a/drivers/video/mb862xx/mb862xxfb.c
+++ b/drivers/video/mb862xx/mb862xxfb.c
--- a/Show more
+++ b/Show more