Merge branches 'x86/apic', 'x86/cleanups', 'x86/mm', 'x86/pat', 'x86/setup' and 'x86/signal'; commit 'v2.6.29' into x86/core

2026-09-26 18:16:26 +00:00 · 2009-03-24 15:19:45 +01:00 · 2009-03-24 15:19:45 +01:00 · 29219683c4
commit 29219683c4
parent 04c93ce499 1cc185211a 45c7b28f3c 9cdec04938 c8608d6b58 14fc9fbc70 8e0ee43bc2
96 changed files with 2008 additions and 2355 deletions
--- a/2
+++ b/2
--- 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/m68k/include/asm/param.h
+++ b/arch/m68k/include/asm/param.h
--- a/arch/m68k/include/asm/param_mm.h
+++ b/arch/m68k/include/asm/param_mm.h
--- a/arch/m68k/include/asm/param_no.h
+++ b/arch/m68k/include/asm/param_no.h
--- a/arch/m68k/include/asm/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
--- a/arch/m68k/include/asm/ptrace_mm.h
+++ b/arch/m68k/include/asm/ptrace_mm.h
--- a/arch/m68k/include/asm/ptrace_no.h
+++ b/arch/m68k/include/asm/ptrace_no.h
--- a/arch/m68k/include/asm/setup.h
+++ b/arch/m68k/include/asm/setup.h
--- a/arch/m68k/include/asm/setup_mm.h
+++ b/arch/m68k/include/asm/setup_mm.h
--- a/arch/m68k/include/asm/setup_no.h
+++ b/arch/m68k/include/asm/setup_no.h
--- a/arch/m68k/include/asm/sigcontext.h
+++ b/arch/m68k/include/asm/sigcontext.h
--- a/arch/m68k/include/asm/sigcontext_mm.h
+++ b/arch/m68k/include/asm/sigcontext_mm.h
--- a/arch/m68k/include/asm/sigcontext_no.h
+++ b/arch/m68k/include/asm/sigcontext_no.h
--- a/arch/m68k/include/asm/siginfo.h
+++ b/arch/m68k/include/asm/siginfo.h
--- a/arch/m68k/include/asm/siginfo_mm.h
+++ b/arch/m68k/include/asm/siginfo_mm.h
--- a/arch/m68k/include/asm/siginfo_no.h
+++ b/arch/m68k/include/asm/siginfo_no.h
--- a/arch/m68k/include/asm/signal.h
+++ b/arch/m68k/include/asm/signal.h
--- a/arch/m68k/include/asm/signal_mm.h
+++ b/arch/m68k/include/asm/signal_mm.h
--- a/arch/m68k/include/asm/signal_no.h
+++ b/arch/m68k/include/asm/signal_no.h
--- a/arch/m68k/include/asm/swab.h
+++ b/arch/m68k/include/asm/swab.h
--- a/arch/m68k/include/asm/swab_mm.h
+++ b/arch/m68k/include/asm/swab_mm.h
--- a/arch/m68k/include/asm/swab_no.h
+++ b/arch/m68k/include/asm/swab_no.h
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
--- a/arch/m68k/include/asm/unistd_mm.h
+++ b/arch/m68k/include/asm/unistd_mm.h
--- a/arch/m68k/include/asm/unistd_no.h
+++ b/arch/m68k/include/asm/unistd_no.h
--- 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/arch/x86/include/asm/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
--- a/arch/x86/include/asm/dmi.h
+++ b/arch/x86/include/asm/dmi.h
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
--- a/arch/x86/kernel/i8253.c
+++ b/arch/x86/kernel/i8253.c
--- a/arch/x86/kernel/io_delay.c
+++ b/arch/x86/kernel/io_delay.c
--- a/arch/x86/kernel/kdebugfs.c
+++ b/arch/x86/kernel/kdebugfs.c
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
--- a/arch/x86/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
--- 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/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.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
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c