Merge branch 'sh/stable-updates'

2026-10-16 22:39:48 +00:00 · 2009-10-13 11:27:08 +09:00 · 2009-10-13 11:27:08 +09:00 · 95019b48ad
commit 95019b48ad
parent 7a0064d672 964f7e5a56
562 changed files with 60559 additions and 9902 deletions
--- a/Documentation/scsi/hptiop.txt
+++ b/Documentation/scsi/hptiop.txt
--- a/22
+++ b/22
--- a/2
+++ b/2
--- a/arch/arm/include/asm/bitops.h
+++ b/arch/arm/include/asm/bitops.h
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/mach-bcmring/core.c
+++ b/arch/arm/mach-bcmring/core.c
--- a/arch/arm/mach-bcmring/include/mach/system.h
+++ b/arch/arm/mach-bcmring/include/mach/system.h
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
--- a/arch/arm/mach-ep93xx/Makefile.boot
+++ b/arch/arm/mach-ep93xx/Makefile.boot
--- a/arch/arm/mach-ep93xx/clock.c
+++ b/arch/arm/mach-ep93xx/clock.c
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
--- a/arch/arm/mach-ep93xx/edb93xx.c
+++ b/arch/arm/mach-ep93xx/edb93xx.c
--- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
--- a/arch/arm/mach-ep93xx/include/mach/gpio.h
+++ b/arch/arm/mach-ep93xx/include/mach/gpio.h
--- a/arch/arm/mach-ep93xx/include/mach/memory.h
+++ b/arch/arm/mach-ep93xx/include/mach/memory.h
--- a/arch/arm/mach-ep93xx/include/mach/platform.h
+++ b/arch/arm/mach-ep93xx/include/mach/platform.h
--- a/arch/arm/mach-ep93xx/micro9.c
+++ b/arch/arm/mach-ep93xx/micro9.c
--- a/arch/arm/mach-integrator/pci_v3.c
+++ b/arch/arm/mach-integrator/pci_v3.c
--- a/arch/arm/mach-pxa/cpufreq-pxa2xx.c
+++ b/arch/arm/mach-pxa/cpufreq-pxa2xx.c
--- a/arch/arm/mach-pxa/csb726.c
+++ b/arch/arm/mach-pxa/csb726.c
--- a/arch/arm/mach-sa1100/Makefile
+++ b/arch/arm/mach-sa1100/Makefile
--- a/arch/arm/mm/cache-v6.S
+++ b/arch/arm/mm/cache-v6.S
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
--- a/arch/arm/mm/highmem.c
+++ b/arch/arm/mm/highmem.c
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
--- a/arch/arm/plat-s3c24xx/adc.c
+++ b/arch/arm/plat-s3c24xx/adc.c
--- a/arch/blackfin/kernel/time.c
+++ b/arch/blackfin/kernel/time.c
--- a/arch/m32r/kernel/smp.c
+++ b/arch/m32r/kernel/smp.c
--- a/arch/s390/include/asm/delay.h
+++ b/arch/s390/include/asm/delay.h
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
--- a/arch/s390/include/asm/ucontext.h
+++ b/arch/s390/include/asm/ucontext.h
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
--- a/arch/s390/kernel/swsusp_asm64.S
+++ b/arch/s390/kernel/swsusp_asm64.S
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
--- a/arch/s390/lib/uaccess_mvcos.c
+++ b/arch/s390/lib/uaccess_mvcos.c
--- a/arch/s390/lib/uaccess_std.c
+++ b/arch/s390/lib/uaccess_std.c
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
--- a/arch/sh/mm/cache.c
+++ b/arch/sh/mm/cache.c
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
--- a/arch/um/drivers/port_kern.c
+++ b/arch/um/drivers/port_kern.c
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
--- a/arch/x86/kernel/cpu/mcheck/mce_intel.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel.c
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
--- a/crypto/aead.c
+++ b/crypto/aead.c
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
--- a/drivers/char/generic_serial.c
+++ b/drivers/char/generic_serial.c
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
--- a/drivers/char/rio/riocmd.c
+++ b/drivers/char/rio/riocmd.c
--- a/drivers/char/rio/rioctrl.c
+++ b/drivers/char/rio/rioctrl.c
--- a/drivers/char/rio/riotty.c
+++ b/drivers/char/rio/riotty.c
--- a/drivers/char/ser_a2232.c
+++ b/drivers/char/ser_a2232.c
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
--- a/drivers/infiniband/core/iwcm.c
+++ b/drivers/infiniband/core/iwcm.c
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
--- a/drivers/infiniband/hw/cxgb3/iwch_qp.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
--- a/drivers/infiniband/hw/ipath/ipath_iba7220.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba7220.c
--- a/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/drivers/infiniband/hw/ipath/ipath_intr.c
--- a/drivers/infiniband/hw/ipath/ipath_qp.c
+++ b/drivers/infiniband/hw/ipath/ipath_qp.c
--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
--- a/drivers/infiniband/hw/ipath/ipath_ud.c
+++ b/drivers/infiniband/hw/ipath/ipath_ud.c
--- a/drivers/infiniband/hw/ipath/ipath_user_pages.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c
--- a/drivers/infiniband/hw/ipath/ipath_user_sdma.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_sdma.c
--- a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
--- a/drivers/input/keyboard/sunkbd.c
+++ b/drivers/input/keyboard/sunkbd.c
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
--- a/drivers/isdn/hisax/arcofi.c
+++ b/drivers/isdn/hisax/arcofi.c
--- a/drivers/isdn/hisax/hfc_2bds0.c
+++ b/drivers/isdn/hisax/hfc_2bds0.c
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
--- a/Show more
+++ b/Show more