Merge branch 'sched/cleanups'; commit 'v2.6.29' into sched/core

2026-09-26 18:16:26 +00:00 · 2009-03-25 10:26:51 +01:00 · 2009-03-25 10:26:51 +01:00 · b6d9842258
commit b6d9842258
parent 67aa0f767a 8e0ee43bc2
49 changed files with 351 additions and 150 deletions
--- a/Documentation/filesystems/ext2.txt
+++ b/Documentation/filesystems/ext2.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/7
+++ b/7
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
--- a/arch/sparc/include/asm/pil.h
+++ b/arch/sparc/include/asm/pil.h
--- a/arch/sparc/kernel/kgdb_64.c
+++ b/arch/sparc/kernel/kgdb_64.c
--- a/arch/sparc/kernel/pci_common.c
+++ b/arch/sparc/kernel/pci_common.c
--- a/arch/sparc/kernel/ttable.S
+++ b/arch/sparc/kernel/ttable.S
--- a/arch/sparc/mm/ultra.S
+++ b/arch/sparc/mm/ultra.S
--- a/drivers/dca/dca-sysfs.c
+++ b/drivers/dca/dca-sysfs.c
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
--- a/drivers/net/wireless/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath9k/ath9k.h
--- a/drivers/net/wireless/ath9k/core.h
+++ b/drivers/net/wireless/ath9k/core.h
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
--- a/include/linux/dca.h
+++ b/include/linux/dca.h
--- a/include/net/netfilter/nf_conntrack_core.h
+++ b/include/net/netfilter/nf_conntrack_core.h
--- a/kernel/signal.c
+++ b/kernel/signal.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
--- a/net/wireless/lib80211_crypt_ccmp.c
+++ b/net/wireless/lib80211_crypt_ccmp.c
--- a/net/wireless/lib80211_crypt_tkip.c
+++ b/net/wireless/lib80211_crypt_tkip.c
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c