Merge branch 'sched/core' into sched/cleanups

2026-09-26 18:16:26 +00:00 · 2009-03-06 11:47:52 +01:00 · 2009-03-06 11:47:52 +01:00 · 7fc07d8410
commit 7fc07d8410
parent b67802ea80 8a0be9ef82
125 changed files with 1261 additions and 605 deletions
--- a/Documentation/scsi/cxgb3i.txt
+++ b/Documentation/scsi/cxgb3i.txt
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
--- a/arch/arm/mm/abort-ev6.S
+++ b/arch/arm/mm/abort-ev6.S
--- a/arch/arm/plat-s3c64xx/irq-eint.c
+++ b/arch/arm/plat-s3c64xx/irq-eint.c
--- a/arch/mips/include/asm/seccomp.h
+++ b/arch/mips/include/asm/seccomp.h
--- a/arch/powerpc/include/asm/compat.h
+++ b/arch/powerpc/include/asm/compat.h
--- a/arch/powerpc/include/asm/seccomp.h
+++ b/arch/powerpc/include/asm/seccomp.h
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
--- a/arch/sparc/include/asm/compat.h
+++ b/arch/sparc/include/asm/compat.h
--- a/arch/sparc/include/asm/seccomp.h
+++ b/arch/sparc/include/asm/seccomp.h
--- a/arch/x86/include/asm/seccomp_32.h
+++ b/arch/x86/include/asm/seccomp_32.h
--- a/arch/x86/include/asm/seccomp_64.h
+++ b/arch/x86/include/asm/seccomp_64.h
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
--- a/arch/x86/mm/iomap_32.c
+++ b/arch/x86/mm/iomap_32.c
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
--- a/arch/x86/mm/testmmiotrace.c
+++ b/arch/x86/mm/testmmiotrace.c
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
--- a/crypto/api.c
+++ b/crypto/api.c
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
--- a/drivers/crypto/padlock-sha.c
+++ b/drivers/crypto/padlock-sha.c
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
--- a/drivers/input/keyboard/bf54x-keys.c
+++ b/drivers/input/keyboard/bf54x-keys.c
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
--- a/drivers/input/mouse/pxa930_trkball.c
+++ b/drivers/input/mouse/pxa930_trkball.c
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
--- a/drivers/input/touchscreen/atmel_tsadcc.c
+++ b/drivers/input/touchscreen/atmel_tsadcc.c
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
--- a/drivers/input/touchscreen/tsc2007.c
+++ b/drivers/input/touchscreen/tsc2007.c
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
--- a/drivers/media/video/uvc/uvc_status.c
+++ b/drivers/media/video/uvc/uvc_status.c
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
--- a/drivers/net/usb/zaurus.c
+++ b/drivers/net/usb/zaurus.c
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
--- a/drivers/net/wireless/libertas/persistcfg.c
+++ b/drivers/net/wireless/libertas/persistcfg.c
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
--- a/drivers/net/wireless/orinoco/orinoco.c
+++ b/drivers/net/wireless/orinoco/orinoco.c
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
--- a/drivers/scsi/cxgb3i/cxgb3i.h
+++ b/drivers/scsi/cxgb3i/cxgb3i.h
--- a/drivers/scsi/cxgb3i/cxgb3i_ddp.c
+++ b/drivers/scsi/cxgb3i/cxgb3i_ddp.c
--- a/drivers/scsi/cxgb3i/cxgb3i_ddp.h
+++ b/drivers/scsi/cxgb3i/cxgb3i_ddp.h
--- a/drivers/scsi/cxgb3i/cxgb3i_init.c
+++ b/drivers/scsi/cxgb3i/cxgb3i_init.c
--- a/drivers/scsi/cxgb3i/cxgb3i_iscsi.c
+++ b/drivers/scsi/cxgb3i/cxgb3i_iscsi.c
--- a/drivers/scsi/cxgb3i/cxgb3i_offload.c
+++ b/drivers/scsi/cxgb3i/cxgb3i_offload.c
--- a/drivers/scsi/cxgb3i/cxgb3i_offload.h
+++ b/drivers/scsi/cxgb3i/cxgb3i_offload.h
--- a/drivers/scsi/cxgb3i/cxgb3i_pdu.c
+++ b/drivers/scsi/cxgb3i/cxgb3i_pdu.c
--- a/drivers/scsi/cxgb3i/cxgb3i_pdu.h
+++ b/drivers/scsi/cxgb3i/cxgb3i_pdu.h
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
--- a/fs/Makefile
+++ b/fs/Makefile
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
--- a/include/linux/netfilter/xt_NFLOG.h
+++ b/include/linux/netfilter/xt_NFLOG.h
--- a/include/linux/rcuclassic.h
+++ b/include/linux/rcuclassic.h
--- a/Show more
+++ b/Show more