Merge branch 'upstream' into topic/asoc

2026-09-24 18:16:04 +00:00 · 2008-12-01 18:02:17 +01:00 · 2008-12-01 18:02:17 +01:00 · 3af4182cc5
commit 3af4182cc5
parent f5d4c67e41 c07f62e5f1
2352 changed files with 111501 additions and 90866 deletions
--- a/.mailmap
+++ b/.mailmap
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/ABI/testing/sysfs-c2port
+++ b/Documentation/ABI/testing/sysfs-c2port
--- a/Documentation/ABI/testing/sysfs-firmware-acpi
+++ b/Documentation/ABI/testing/sysfs-firmware-acpi
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/deviceiobook.tmpl
+++ b/Documentation/DocBook/deviceiobook.tmpl
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/DocBook/kernel-hacking.tmpl
+++ b/Documentation/DocBook/kernel-hacking.tmpl
--- a/Documentation/DocBook/mcabook.tmpl
+++ b/Documentation/DocBook/mcabook.tmpl
--- a/Documentation/DocBook/wanbook.tmpl
+++ b/Documentation/DocBook/wanbook.tmpl
--- a/Documentation/DocBook/z8530book.tmpl
+++ b/Documentation/DocBook/z8530book.tmpl
--- a/Documentation/ManagementStyle
+++ b/Documentation/ManagementStyle
--- a/Documentation/PCI/00-INDEX
+++ b/Documentation/PCI/00-INDEX
--- a/Documentation/PCI/MSI-HOWTO.txt
+++ b/Documentation/PCI/MSI-HOWTO.txt
--- a/Documentation/accounting/.gitignore
+++ b/Documentation/accounting/.gitignore
--- a/Documentation/acpi/debug.txt
+++ b/Documentation/acpi/debug.txt
--- a/Documentation/arm/empeg/README
+++ b/Documentation/arm/empeg/README
--- a/Documentation/arm/empeg/ir.txt
+++ b/Documentation/arm/empeg/ir.txt
--- a/Documentation/arm/empeg/mkdevs
+++ b/Documentation/arm/empeg/mkdevs
--- a/Documentation/auxdisplay/.gitignore
+++ b/Documentation/auxdisplay/.gitignore
--- a/Documentation/blockdev/00-INDEX
+++ b/Documentation/blockdev/00-INDEX
--- a/Documentation/blockdev/README.DAC960
+++ b/Documentation/blockdev/README.DAC960
--- a/Documentation/blockdev/cciss.txt
+++ b/Documentation/blockdev/cciss.txt
--- a/Documentation/blockdev/cpqarray.txt
+++ b/Documentation/blockdev/cpqarray.txt
--- a/Documentation/blockdev/floppy.txt
+++ b/Documentation/blockdev/floppy.txt
--- a/Documentation/blockdev/nbd.txt
+++ b/Documentation/blockdev/nbd.txt
--- a/Documentation/blockdev/paride.txt
+++ b/Documentation/blockdev/paride.txt
--- a/Documentation/blockdev/ramdisk.txt
+++ b/Documentation/blockdev/ramdisk.txt
--- a/Documentation/c2port.txt
+++ b/Documentation/c2port.txt
--- a/Documentation/cgroups/freezer-subsystem.txt
+++ b/Documentation/cgroups/freezer-subsystem.txt
--- a/Documentation/connector/.gitignore
+++ b/Documentation/connector/.gitignore
--- a/Documentation/cpu-freq/user-guide.txt
+++ b/Documentation/cpu-freq/user-guide.txt
--- a/Documentation/email-clients.txt
+++ b/Documentation/email-clients.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/ramfs-rootfs-initramfs.txt
+++ b/Documentation/filesystems/ramfs-rootfs-initramfs.txt
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/filesystems/xip.txt
+++ b/Documentation/filesystems/xip.txt
--- a/Documentation/ftrace.txt
+++ b/Documentation/ftrace.txt
--- a/Documentation/hwmon/adt7462
+++ b/Documentation/hwmon/adt7462
--- a/Documentation/hwmon/lis3lv02d
+++ b/Documentation/hwmon/lis3lv02d
--- a/Documentation/i2c/busses/i2c-sis96x
+++ b/Documentation/i2c/busses/i2c-sis96x
--- a/Documentation/ia64/.gitignore
+++ b/Documentation/ia64/.gitignore
--- a/Documentation/ics932s401
+++ b/Documentation/ics932s401
--- a/Documentation/input/elantech.txt
+++ b/Documentation/input/elantech.txt
--- a/Documentation/input/input-programming.txt
+++ b/Documentation/input/input-programming.txt
--- a/Documentation/io-mapping.txt
+++ b/Documentation/io-mapping.txt
--- a/Documentation/ioctl/00-INDEX
+++ b/Documentation/ioctl/00-INDEX
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
--- a/Documentation/isdn/CREDITS
+++ b/Documentation/isdn/CREDITS
--- a/Documentation/ja_JP/HOWTO
+++ b/Documentation/ja_JP/HOWTO
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/lguest/Makefile
+++ b/Documentation/lguest/Makefile
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
--- a/Documentation/networking/.gitignore
+++ b/Documentation/networking/.gitignore
--- a/Documentation/networking/dmfe.txt
+++ b/Documentation/networking/dmfe.txt
--- a/Documentation/networking/phy.txt
+++ b/Documentation/networking/phy.txt
--- a/Documentation/pcmcia/.gitignore
+++ b/Documentation/pcmcia/.gitignore
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
--- a/Documentation/scheduler/00-INDEX
+++ b/Documentation/scheduler/00-INDEX
--- a/Documentation/scheduler/sched-design-CFS.txt
+++ b/Documentation/scheduler/sched-design-CFS.txt
--- a/Documentation/scsi/aacraid.txt
+++ b/Documentation/scsi/aacraid.txt
--- a/Documentation/serial/00-INDEX
+++ b/Documentation/serial/00-INDEX
--- a/Documentation/serial/README.cycladesZ
+++ b/Documentation/serial/README.cycladesZ
--- a/Documentation/serial/computone.txt
+++ b/Documentation/serial/computone.txt
--- a/Documentation/serial/digiepca.txt
+++ b/Documentation/serial/digiepca.txt
--- a/Documentation/serial/hayes-esp.txt
+++ b/Documentation/serial/hayes-esp.txt
--- a/Documentation/serial/moxa-smartio
+++ b/Documentation/serial/moxa-smartio
--- a/Documentation/serial/riscom8.txt
+++ b/Documentation/serial/riscom8.txt
--- a/Documentation/serial/rocket.txt
+++ b/Documentation/serial/rocket.txt
--- a/Documentation/serial/specialix.txt
+++ b/Documentation/serial/specialix.txt
--- a/Documentation/serial/stallion.txt
+++ b/Documentation/serial/stallion.txt
--- a/Documentation/serial/sx.txt
+++ b/Documentation/serial/sx.txt
--- a/Documentation/serial/tty.txt
+++ b/Documentation/serial/tty.txt
--- a/Documentation/sh/new-machine.txt
+++ b/Documentation/sh/new-machine.txt
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
--- a/Documentation/spi/.gitignore
+++ b/Documentation/spi/.gitignore
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
--- a/Documentation/tracers/mmiotrace.txt
+++ b/Documentation/tracers/mmiotrace.txt
--- a/Documentation/video4linux/.gitignore
+++ b/Documentation/video4linux/.gitignore
--- a/Documentation/video4linux/README.cx88
+++ b/Documentation/video4linux/README.cx88
--- a/Documentation/video4linux/bttv/CONTRIBUTORS
+++ b/Documentation/video4linux/bttv/CONTRIBUTORS
--- a/Documentation/video4linux/si470x.txt
+++ b/Documentation/video4linux/si470x.txt
--- a/Documentation/vm/.gitignore
+++ b/Documentation/vm/.gitignore
--- a/Documentation/w1/masters/omap-hdq
+++ b/Documentation/w1/masters/omap-hdq
--- a/Documentation/watchdog/src/.gitignore
+++ b/Documentation/watchdog/src/.gitignore
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
--- a/Documentation/x86/x86_64/fake-numa-for-cpusets
+++ b/Documentation/x86/x86_64/fake-numa-for-cpusets
--- a/90
+++ b/90
--- a/12
+++ b/12
--- a/arch/Kconfig
+++ b/arch/Kconfig
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
--- a/arch/arm/common/sharpsl_pm.c
+++ b/arch/arm/common/sharpsl_pm.c
--- a/Show more
+++ b/Show more