Merge from 2.6.9-rc2 finished.
authorKurt Garloff <garloff@suse.de>
Tue, 14 Sep 2004 21:27:10 +0000 (21:27 +0000)
committerKurt Garloff <garloff@suse.de>
Tue, 14 Sep 2004 21:27:10 +0000 (21:27 +0000)
commit8783a365350229180b8ec05b4d41810de28cb524
tree9ef38cd1af3ad767a9db84c2084c1b5b569a2adb
parent517edd2cb33714c9058e7cdc3402586de2c74a5a
parent8a690d16e64e76f884d74128dc10ac6b28c135d2
Merge from 2.6.9-rc2 finished.
A number of patches has been commented out with +rc2, mainly AIO stuff
and IPv6 netfilter stuff.

suse-commit: c0b14bf98bb228596e8e6fca78188cd25c5c8d0f
187 files changed:
Documentation/kernel-parameters.txt
Documentation/sysctl/kernel.txt
Makefile
arch/arm/Kconfig
arch/i386/kernel/apic.c
arch/i386/kernel/entry.S
arch/i386/kernel/i8259.c
arch/i386/kernel/io_apic.c
arch/i386/kernel/nmi.c
arch/i386/kernel/setup.c
arch/i386/kernel/smpboot.c
arch/i386/kernel/time.c
arch/i386/kernel/traps.c
arch/i386/kernel/vmlinux.lds.S
arch/i386/mm/discontig.c
arch/ia64/configs/generic_defconfig
arch/ia64/kernel/head.S
arch/ia64/kernel/irq.c
arch/ia64/kernel/sal.c
arch/ia64/kernel/smpboot.c
arch/ia64/kernel/traps.c
arch/ia64/kernel/unwind.c
arch/ia64/kernel/vmlinux.lds.S
arch/ppc/Kconfig
arch/ppc/Makefile
arch/ppc/boot/openfirmware/common.c
arch/ppc/boot/simple/misc.c
arch/ppc/kernel/setup.c
arch/ppc/platforms/chrp_setup.c
arch/ppc/platforms/pmac_setup.c
arch/ppc/platforms/prep_setup.c
arch/ppc64/kernel/chrp_setup.c
arch/ppc64/kernel/setup.c
arch/s390/Kconfig
arch/s390/Makefile
arch/s390/kernel/s390_ksyms.c
arch/sparc/Kconfig
arch/sparc64/Kconfig
arch/um/Kconfig
arch/x86_64/Kconfig
arch/x86_64/kernel/apic.c
crypto/tcrypt.c
drivers/Makefile
drivers/acpi/osl.c
drivers/acpi/processor.c
drivers/block/scsi_ioctl.c
drivers/char/Kconfig
drivers/char/Makefile
drivers/char/agp/intel-agp.c
drivers/char/random.c
drivers/char/tty_io.c
drivers/char/vt.c
drivers/ide/ide-io.c
drivers/ide/ide-lib.c
drivers/ide/ide-probe.c
drivers/ide/ide.c
drivers/ide/ppc/pmac.c
drivers/macintosh/adbhid.c
drivers/md/Kconfig
drivers/md/Makefile
drivers/message/fusion/mptctl.c
drivers/net/Kconfig
drivers/net/e1000/e1000_main.c
drivers/net/ppp_generic.c
drivers/net/sk98lin/skge.c
drivers/scsi/Kconfig
drivers/scsi/Makefile
drivers/scsi/scsi.c
drivers/scsi/scsi_error.c
drivers/scsi/scsi_ioctl.c
drivers/scsi/scsi_scan.c
drivers/scsi/sg.c
drivers/serial/68360serial.c
drivers/serial/8250.c
drivers/serial/sn_console.c
drivers/usb/core/hub.c
drivers/video/Makefile
drivers/video/bootsplash/bootsplash.c
drivers/video/console/fbcon.c
drivers/video/console/fbcon.h
drivers/video/vesafb.c
fs/Kconfig
fs/Makefile
fs/affs/inode.c
fs/buffer.c
fs/compat.c
fs/exec.c
fs/ext3/super.c
fs/fs-writeback.c
fs/hugetlbfs/inode.c
fs/inode.c
fs/namei.c
fs/nfs/dir.c
fs/nfs/inode.c
fs/nfs/nfs3proc.c
fs/nfs/nfs3xdr.c
fs/nfsd/nfsproc.c
fs/nfsd/nfssvc.c
fs/nfsd/vfs.c
fs/proc/base.c
fs/proc/proc_misc.c
fs/reiserfs/super.c
include/asm-arm/cacheflush.h
include/asm-i386/page.h
include/asm-i386/processor.h
include/asm-i386/ptrace.h
include/asm-ppc/io.h
include/asm-ppc64/io.h
include/asm-ppc64/processor.h
include/asm-s390/processor.h
include/asm-um/processor-generic.h
include/asm-x86_64/processor.h
include/linux/device.h
include/linux/fb.h
include/linux/fs.h
include/linux/gfp.h
include/linux/ide.h
include/linux/init_task.h
include/linux/mm.h
include/linux/netdevice.h
include/linux/netfilter.h
include/linux/netfilter_ipv4/ip_conntrack.h
include/linux/nfs_xdr.h
include/linux/page-flags.h
include/linux/proc_fs.h
include/linux/sched.h
include/linux/sysctl.h
include/linux/usb.h
include/net/ip.h
include/net/ipv6.h
include/net/neighbour.h
include/net/tcp.h
include/net/xfrm.h
include/scsi/scsi.h
include/scsi/scsi_device.h
init/main.c
kernel/exit.c
kernel/fork.c
kernel/module.c
kernel/sched.c
kernel/signal.c
kernel/sys.c
kernel/sysctl.c
lib/Makefile
mm/filemap.c
mm/hugetlb.c
mm/memory.c
mm/page-writeback.c
mm/page_alloc.c
mm/readahead.c
mm/rmap.c
mm/swap_state.c
mm/swapfile.c
mm/truncate.c
mm/vmscan.c
net/compat.c
net/core/dev.c
net/core/neighbour.c
net/core/netfilter.c
net/core/rtnetlink.c
net/ipv4/devinet.c
net/ipv4/ip_output.c
net/ipv4/ipcomp.c
net/ipv4/ipip.c
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/ip_conntrack_core.c
net/ipv4/netfilter/ip_conntrack_standalone.c
net/ipv4/netfilter/ip_nat_standalone.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/xfrm4_output.c
net/ipv6/addrconf.c
net/ipv6/ip6_output.c
net/ipv6/ndisc.c
net/ipv6/netfilter/Kconfig
net/ipv6/netfilter/Makefile
net/ipv6/raw.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c
net/ipv6/udp.c
scripts/Makefile.modpost
scripts/mod/modpost.c
scripts/mod/modpost.h
security/commoncap.c
security/security.c
security/selinux/hooks.c
sound/pci/intel8x0.c