Merge branch 'master' of /home/src/linux-2.6/

2026-09-14 18:22:56 +00:00 · 2005-09-26 10:50:29 +01:00 · 2005-09-26 10:50:29 +01:00 · e8c2cd99a3
commit e8c2cd99a3
parent 5a8c0cc32b 8ddec7460d
148 changed files with 2828 additions and 953 deletions
--- a/Documentation/device-mapper/snapshot.txt
+++ b/Documentation/device-mapper/snapshot.txt
--- a/Documentation/sparse.txt
+++ b/Documentation/sparse.txt
--- a/Documentation/usb/URB.txt
+++ b/Documentation/usb/URB.txt
--- a/14
+++ b/14
--- a/8
+++ b/8
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
--- a/arch/arm/kernel/io.c
+++ b/arch/arm/kernel/io.c
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
--- a/arch/ia64/kernel/mca_asm.S
+++ b/arch/ia64/kernel/mca_asm.S
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
--- a/arch/ppc/kernel/perfmon.c
+++ b/arch/ppc/kernel/perfmon.c
--- a/arch/ppc/platforms/pmac_setup.c
+++ b/arch/ppc/platforms/pmac_setup.c
--- a/arch/ppc/syslib/of_device.c
+++ b/arch/ppc/syslib/of_device.c
--- a/arch/ppc/syslib/ppc85xx_setup.c
+++ b/arch/ppc/syslib/ppc85xx_setup.c
--- a/arch/ppc64/kernel/of_device.c
+++ b/arch/ppc64/kernel/of_device.c
--- a/arch/ppc64/kernel/pSeries_iommu.c
+++ b/arch/ppc64/kernel/pSeries_iommu.c
--- a/arch/ppc64/kernel/pmac_setup.c
+++ b/arch/ppc64/kernel/pmac_setup.c
--- a/arch/ppc64/kernel/pmac_time.c
+++ b/arch/ppc64/kernel/pmac_time.c
--- a/arch/ppc64/kernel/ptrace.c
+++ b/arch/ppc64/kernel/ptrace.c
--- a/arch/ppc64/mm/hash_native.c
+++ b/arch/ppc64/mm/hash_native.c
--- a/arch/ppc64/mm/hugetlbpage.c
+++ b/arch/ppc64/mm/hugetlbpage.c
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
--- a/arch/um/drivers/mconsole_user.c
+++ b/arch/um/drivers/mconsole_user.c
--- a/arch/um/include/user.h
+++ b/arch/um/include/user.h
--- a/arch/um/kernel/process_kern.c
+++ b/arch/um/kernel/process_kern.c
--- a/arch/um/kernel/sigio_user.c
+++ b/arch/um/kernel/sigio_user.c
--- a/arch/um/kernel/tlb.c
+++ b/arch/um/kernel/tlb.c
--- a/arch/um/kernel/trap_kern.c
+++ b/arch/um/kernel/trap_kern.c
--- a/arch/um/kernel/tt/uaccess_user.c
+++ b/arch/um/kernel/tt/uaccess_user.c
--- a/arch/um/kernel/umid.c
+++ b/arch/um/kernel/umid.c
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
--- a/arch/xtensa/kernel/platform.c
+++ b/arch/xtensa/kernel/platform.c
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
--- a/drivers/i2c/busses/i2c-pmac-smu.c
+++ b/drivers/i2c/busses/i2c-pmac-smu.c
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bttvp.h
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
--- a/drivers/mtd/devices/docecc.c
+++ b/drivers/mtd/devices/docecc.c
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
--- a/drivers/pci/hotplug.c
+++ b/drivers/pci/hotplug.c
--- a/drivers/pci/hotplug/rpadlpar_sysfs.c
+++ b/drivers/pci/hotplug/rpadlpar_sysfs.c
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
--- a/drivers/usb/gadget/pxa2xx_udc.h
+++ b/drivers/usb/gadget/pxa2xx_udc.h
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
--- a/drivers/usb/net/pegasus.c
+++ b/drivers/usb/net/pegasus.c
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
--- a/drivers/video/aty/xlinit.c
+++ b/drivers/video/aty/xlinit.c
--- a/fs/9p/conv.c
+++ b/fs/9p/conv.c
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
--- a/fs/jfs/jfs_txnmgr.h
+++ b/fs/jfs/jfs_txnmgr.h
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
--- a/Show more
+++ b/Show more