Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2026-09-14 18:22:56 +00:00 · 2005-06-06 09:57:33 -07:00 · 2005-06-06 09:57:33 -07:00 · 0b68177ccd
commit 0b68177ccd
parent d0d2f2df65 7cef5677ef
56 changed files with 2337 additions and 1322 deletions
--- a/Documentation/DocBook/libata.tmpl
+++ b/Documentation/DocBook/libata.tmpl
--- a/2
+++ b/2
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
--- a/arch/ppc64/kernel/entry.S
+++ b/arch/ppc64/kernel/entry.S
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
--- a/arch/ppc64/kernel/iSeries_setup.c
+++ b/arch/ppc64/kernel/iSeries_setup.c
--- a/arch/ppc64/kernel/idle.c
+++ b/arch/ppc64/kernel/idle.c
--- a/arch/ppc64/kernel/process.c
+++ b/arch/ppc64/kernel/process.c
--- a/arch/ppc64/kernel/prom_init.c
+++ b/arch/ppc64/kernel/prom_init.c
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
--- a/arch/ppc64/kernel/smp.c
+++ b/arch/ppc64/kernel/smp.c
--- a/arch/ppc64/kernel/sysfs.c
+++ b/arch/ppc64/kernel/sysfs.c
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
--- a/arch/s390/appldata/appldata_net_sum.c
+++ b/arch/s390/appldata/appldata_net_sum.c
--- a/arch/s390/appldata/appldata_os.c
+++ b/arch/s390/appldata/appldata_os.c
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
--- a/drivers/atm/Makefile
+++ b/drivers/atm/Makefile
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
--- a/drivers/net/shaper.c
+++ b/drivers/net/shaper.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/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
--- a/drivers/usb/media/pwc/ChangeLog
+++ b/drivers/usb/media/pwc/ChangeLog
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
--- a/fs/mpage.c
+++ b/fs/mpage.c
--- a/include/asm-ppc64/processor.h
+++ b/include/asm-ppc64/processor.h
--- a/include/asm-ppc64/thread_info.h
+++ b/include/asm-ppc64/thread_info.h
--- a/include/asm-s390/user.h
+++ b/include/asm-s390/user.h
--- a/include/linux/if_shaper.h
+++ b/include/linux/if_shaper.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
--- a/net/ipv4/ipvs/Makefile
+++ b/net/ipv4/ipvs/Makefile
--- a/net/ipv4/ipvs/ip_vs_proto.c
+++ b/net/ipv4/ipvs/ip_vs_proto.c
--- a/net/ipv4/ipvs/ip_vs_proto_icmp.c
+++ b/net/ipv4/ipvs/ip_vs_proto_icmp.c
--- a/net/ipv6/ipv6_syms.c
+++ b/net/ipv6/ipv6_syms.c