TAKE 904196 - Merge up to 2.6.17

[nathans@xxxxxxx (Nathan Scott)]

Date:  Sun Jun 18 13:17:41 AEST 2006
Workarea:  chook.melbourne.sgi.com:/build/nathans/2.6.x-xfs
Inspected by:  torvalds@xxxxxxxx

The following file(s) were checked into:
  longdrop.melbourne.sgi.com:/isms/linux/2.6.x-xfs-melb


Modid:  2.6.x-xfs-melb:linux:26275a
Makefile - 1.43 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/Makefile.diff?r1=text&tr1=1.43&r2=text&tr2=1.42&f=h
arch/alpha/Kconfig - 1.13 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/alpha/Kconfig.diff?r1=text&tr1=1.13&r2=text&tr2=1.12&f=h
arch/arm/mach-sa1100/neponset.c - 1.9 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/arm/mach-sa1100/neponset.c.diff?r1=text&tr1=1.9&r2=text&tr2=1.8&f=h
arch/i386/kernel/setup.c - 1.19 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/i386/kernel/setup.c.diff?r1=text&tr1=1.19&r2=text&tr2=1.18&f=h
arch/sparc/kernel/smp.c - 1.10 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/sparc/kernel/smp.c.diff?r1=text&tr1=1.10&r2=text&tr2=1.9&f=h
arch/sparc64/kernel/smp.c - 1.19 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/sparc64/kernel/smp.c.diff?r1=text&tr1=1.19&r2=text&tr2=1.18&f=h
arch/sparc64/kernel/sparc64_ksyms.c - 1.16 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/sparc64/kernel/sparc64_ksyms.c.diff?r1=text&tr1=1.16&r2=text&tr2=1.15&f=h
arch/sparc64/kernel/traps.c - 1.15 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/sparc64/kernel/traps.c.diff?r1=text&tr1=1.15&r2=text&tr2=1.14&f=h
arch/x86_64/kernel/io_apic.c - 1.23 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/x86_64/kernel/io_apic.c.diff?r1=text&tr1=1.23&r2=text&tr2=1.22&f=h
drivers/cdrom/cdrom.c - 1.17 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/cdrom/cdrom.c.diff?r1=text&tr1=1.17&r2=text&tr2=1.16&f=h
drivers/char/Makefile - 1.15 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/char/Makefile.diff?r1=text&tr1=1.15&r2=text&tr2=1.14&f=h
drivers/char/n_tty.c - 1.15 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/char/n_tty.c.diff?r1=text&tr1=1.15&r2=text&tr2=1.14&f=h
drivers/net/e1000/e1000_ethtool.c - 1.16 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/net/e1000/e1000_ethtool.c.diff?r1=text&tr1=1.16&r2=text&tr2=1.15&f=h
drivers/net/e1000/e1000_main.c - 1.20 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/net/e1000/e1000_main.c.diff?r1=text&tr1=1.20&r2=text&tr2=1.19&f=h
drivers/net/tg3.c - 1.25 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/net/tg3.c.diff?r1=text&tr1=1.25&r2=text&tr2=1.24&f=h
drivers/net/tg3.h - 1.19 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/net/tg3.h.diff?r1=text&tr1=1.19&r2=text&tr2=1.18&f=h
drivers/pci/pci-driver.c - 1.14 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/pci/pci-driver.c.diff?r1=text&tr1=1.14&r2=text&tr2=1.13&f=h
drivers/pci/pci.c - 1.17 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/pci/pci.c.diff?r1=text&tr1=1.17&r2=text&tr2=1.16&f=h
drivers/video/console/fbcon.c - 1.21 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/video/console/fbcon.c.diff?r1=text&tr1=1.21&r2=text&tr2=1.20&f=h
fs/bio.c - 1.19 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/fs/bio.c.diff?r1=text&tr1=1.19&r2=text&tr2=1.18&f=h
fs/locks.c - 1.18 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/fs/locks.c.diff?r1=text&tr1=1.18&r2=text&tr2=1.17&f=h
include/linux/elevator.h - 1.11 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/linux/elevator.h.diff?r1=text&tr1=1.11&r2=text&tr2=1.10&f=h
include/linux/i2o.h - 1.14 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/linux/i2o.h.diff?r1=text&tr1=1.14&r2=text&tr2=1.13&f=h
kernel/exit.c - 1.34 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/kernel/exit.c.diff?r1=text&tr1=1.34&r2=text&tr2=1.33&f=h
mm/shmem.c - 1.19 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/mm/shmem.c.diff?r1=text&tr1=1.19&r2=text&tr2=1.18&f=h
mm/vmscan.c - 1.25 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/mm/vmscan.c.diff?r1=text&tr1=1.25&r2=text&tr2=1.24&f=h
net/ipv4/ip_forward.c - 1.5 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/net/ipv4/ip_forward.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
net/ipv4/tcp_input.c - 1.18 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/net/ipv4/tcp_input.c.diff?r1=text&tr1=1.18&r2=text&tr2=1.17&f=h
arch/arm/mach-integrator/integrator_cp.c - 1.12 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/arm/mach-integrator/integrator_cp.c.diff?r1=text&tr1=1.12&r2=text&tr2=1.11&f=h
arch/arm/mach-versatile/core.c - 1.13 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/arm/mach-versatile/core.c.diff?r1=text&tr1=1.13&r2=text&tr2=1.12&f=h
include/linux/mempolicy.h - 1.10 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/linux/mempolicy.h.diff?r1=text&tr1=1.10&r2=text&tr2=1.9&f=h
arch/arm/mach-imx/irq.c - 1.3 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/arm/mach-imx/irq.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
drivers/message/i2o/iop.c - 1.7 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/message/i2o/iop.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.6&f=h
drivers/message/i2o/exec-osm.c - 1.8 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/message/i2o/exec-osm.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.7&f=h
include/linux/pci-acpi.h - 1.3 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/linux/pci-acpi.h.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
drivers/usb/host/ohci-pxa27x.c - 1.7 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/usb/host/ohci-pxa27x.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.6&f=h
arch/i386/kernel/acpi/earlyquirk.c - 1.4 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/i386/kernel/acpi/earlyquirk.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.3&f=h
drivers/acpi/processor_perflib.c - 1.5 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/acpi/processor_perflib.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
fs/debugfs/inode.c - 1.5 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/fs/debugfs/inode.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
kernel/posix-cpu-timers.c - 1.5 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/kernel/posix-cpu-timers.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
drivers/message/fusion/mptspi.c - 1.6 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/message/fusion/mptspi.c.diff?r1=text&tr1=1.6&r2=text&tr2=1.5&f=h
drivers/scsi/sata_mv.c - 1.8 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/scsi/sata_mv.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.7&f=h
net/dccp/ackvec.c - 1.5 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/net/dccp/ackvec.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
arch/arm/mach-pxa/spitz.c - 1.5 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/arm/mach-pxa/spitz.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
include/asm-s390/futex.h - 1.4 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/asm-s390/futex.h.diff?r1=text&tr1=1.4&r2=text&tr2=1.3&f=h
block/noop-iosched.c - 1.2 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/block/noop-iosched.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
block/elevator.c - 1.6 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/block/elevator.c.diff?r1=text&tr1=1.6&r2=text&tr2=1.5&f=h
block/deadline-iosched.c - 1.4 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/block/deadline-iosched.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.3&f=h
block/cfq-iosched.c - 1.6 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/block/cfq-iosched.c.diff?r1=text&tr1=1.6&r2=text&tr2=1.5&f=h
block/as-iosched.c - 1.4 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/block/as-iosched.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.3&f=h
arch/powerpc/platforms/pseries/setup.c - 1.5 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/powerpc/platforms/pseries/setup.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
include/asm-powerpc/cputable.h - 1.6 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/asm-powerpc/cputable.h.diff?r1=text&tr1=1.6&r2=text&tr2=1.5&f=h
arch/powerpc/platforms/cell/setup.c - 1.4 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/powerpc/platforms/cell/setup.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.3&f=h
arch/powerpc/mm/hash_native_64.c - 1.3 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/powerpc/mm/hash_native_64.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/powerpc/kernel/signal_64.c - 1.7 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/powerpc/kernel/signal_64.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.6&f=h
arch/powerpc/kernel/signal_32.c - 1.7 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/powerpc/kernel/signal_32.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.6&f=h
arch/powerpc/kernel/prom_init.c - 1.8 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/powerpc/kernel/prom_init.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.7&f=h
drivers/net/sky2.c - 1.8 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/net/sky2.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.7&f=h
include/asm-arm/arch-pxa/ohci.h - 1.2 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/asm-arm/arch-pxa/ohci.h.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
Documentation/memory-barriers.txt - 1.2 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/Documentation/memory-barriers.txt.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
arch/arm/mach-ep93xx/ts72xx.c - 1.2 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/arm/mach-ep93xx/ts72xx.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
arch/sparc64/kernel/pci_sun4v.c - 1.2 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/sparc64/kernel/pci_sun4v.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
drivers/net/wireless/bcm43xx/bcm43xx_dma.c - 1.2 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/net/wireless/bcm43xx/bcm43xx_dma.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h