Merge commit 'v2.6.27-rc3' into x86/prototypes

Conflicts: include/asm-x86/dma-mapping.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-09-18 18:15:59 +00:00 · 2008-08-14 12:19:59 +02:00 · 2008-08-14 12:19:59 +02:00 · 8d7ccaa545
commit 8d7ccaa545
parent b2139aa0ee 30a2f3c60a
9861 changed files with 488139 additions and 368216 deletions
--- a/8
+++ b/8
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/ABI/testing/sysfs-class-regulator
+++ b/Documentation/ABI/testing/sysfs-class-regulator
--- a/Documentation/ABI/testing/sysfs-dev
+++ b/Documentation/ABI/testing/sysfs-dev
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
--- a/Documentation/ABI/testing/sysfs-kernel-mm
+++ b/Documentation/ABI/testing/sysfs-kernel-mm
--- a/Documentation/ABI/testing/sysfs-kernel-mm-hugepages
+++ b/Documentation/ABI/testing/sysfs-kernel-mm-hugepages
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
--- a/Documentation/DMA-attributes.txt
+++ b/Documentation/DMA-attributes.txt
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/kernel-locking.tmpl
+++ b/Documentation/DocBook/kernel-locking.tmpl
--- a/Documentation/DocBook/kgdb.tmpl
+++ b/Documentation/DocBook/kgdb.tmpl
--- a/Documentation/DocBook/procfs-guide.tmpl
+++ b/Documentation/DocBook/procfs-guide.tmpl
--- a/Documentation/DocBook/procfs_example.c
+++ b/Documentation/DocBook/procfs_example.c
--- a/Documentation/DocBook/s390-drivers.tmpl
+++ b/Documentation/DocBook/s390-drivers.tmpl
--- a/Documentation/DocBook/sh.tmpl
+++ b/Documentation/DocBook/sh.tmpl
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
--- a/Documentation/DocBook/videobook.tmpl
+++ b/Documentation/DocBook/videobook.tmpl
--- a/Documentation/DocBook/z8530book.tmpl
+++ b/Documentation/DocBook/z8530book.tmpl
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/Intel-IOMMU.txt
+++ b/Documentation/Intel-IOMMU.txt
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/accounting/Makefile
+++ b/Documentation/accounting/Makefile
--- a/Documentation/accounting/delay-accounting.txt
+++ b/Documentation/accounting/delay-accounting.txt
--- a/Documentation/accounting/getdelays.c
+++ b/Documentation/accounting/getdelays.c
--- a/Documentation/accounting/taskstats-struct.txt
+++ b/Documentation/accounting/taskstats-struct.txt
--- a/Documentation/arm/IXP4xx
+++ b/Documentation/arm/IXP4xx
--- a/Documentation/arm/Interrupts
+++ b/Documentation/arm/Interrupts
--- a/Documentation/arm/README
+++ b/Documentation/arm/README
--- a/Documentation/arm/Samsung-S3C24XX/GPIO.txt
+++ b/Documentation/arm/Samsung-S3C24XX/GPIO.txt
--- a/Documentation/arm/Samsung-S3C24XX/Overview.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt
--- a/Documentation/arm/Samsung-S3C24XX/USB-Host.txt
+++ b/Documentation/arm/Samsung-S3C24XX/USB-Host.txt
--- a/Documentation/auxdisplay/Makefile
+++ b/Documentation/auxdisplay/Makefile
--- a/Documentation/bt8xxgpio.txt
+++ b/Documentation/bt8xxgpio.txt
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
--- a/Documentation/cli-sti-removal.txt
+++ b/Documentation/cli-sti-removal.txt
--- a/Documentation/connector/Makefile
+++ b/Documentation/connector/Makefile
--- a/Documentation/controllers/memory.txt
+++ b/Documentation/controllers/memory.txt
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
--- a/Documentation/edac.txt
+++ b/Documentation/edac.txt
--- a/Documentation/fb/sh7760fb.txt
+++ b/Documentation/fb/sh7760fb.txt
--- a/Documentation/fb/tridentfb.txt
+++ b/Documentation/fb/tridentfb.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/bfs.txt
+++ b/Documentation/filesystems/bfs.txt
--- a/Documentation/filesystems/configfs/Makefile
+++ b/Documentation/filesystems/configfs/Makefile
--- a/Documentation/filesystems/configfs/configfs.txt
+++ b/Documentation/filesystems/configfs/configfs.txt
--- a/Documentation/filesystems/configfs/configfs_example.c
+++ b/Documentation/filesystems/configfs/configfs_example.c
--- a/Documentation/filesystems/configfs/configfs_example_explicit.c
+++ b/Documentation/filesystems/configfs/configfs_example_explicit.c
--- a/Documentation/filesystems/configfs/configfs_example_macros.c
+++ b/Documentation/filesystems/configfs/configfs_example_macros.c
--- a/Documentation/filesystems/omfs.txt
+++ b/Documentation/filesystems/omfs.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/quota.txt
+++ b/Documentation/filesystems/quota.txt
--- a/Documentation/filesystems/relay.txt
+++ b/Documentation/filesystems/relay.txt
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/ftrace.txt
+++ b/Documentation/ftrace.txt
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
--- a/Documentation/hwmon/dme1737
+++ b/Documentation/hwmon/dme1737
--- a/Documentation/hwmon/it87
+++ b/Documentation/hwmon/it87
--- a/Documentation/hwmon/lm85
+++ b/Documentation/hwmon/lm85
--- a/Documentation/hwmon/w83627hf
+++ b/Documentation/hwmon/w83627hf
--- a/Documentation/hwmon/w83791d
+++ b/Documentation/hwmon/w83791d
--- a/Documentation/i2c/upgrading-clients
+++ b/Documentation/i2c/upgrading-clients
--- a/Documentation/ia64/Makefile
+++ b/Documentation/ia64/Makefile
--- a/Documentation/ia64/kvm.txt
+++ b/Documentation/ia64/kvm.txt
--- a/Documentation/input/cs461x.txt
+++ b/Documentation/input/cs461x.txt
--- a/Documentation/ioctl/ioctl-decoding.txt
+++ b/Documentation/ioctl/ioctl-decoding.txt
--- a/Documentation/iostats.txt
+++ b/Documentation/iostats.txt
--- a/Documentation/isdn/README.mISDN
+++ b/Documentation/isdn/README.mISDN
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/keys.txt
+++ b/Documentation/keys.txt
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
--- a/Documentation/leds-class.txt
+++ b/Documentation/leds-class.txt
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
--- a/Documentation/local_ops.txt
+++ b/Documentation/local_ops.txt
--- a/Documentation/moxa-smartio
+++ b/Documentation/moxa-smartio
--- a/Documentation/networking/Makefile
+++ b/Documentation/networking/Makefile
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
--- a/Documentation/networking/e1000.txt
+++ b/Documentation/networking/e1000.txt
--- a/Documentation/networking/ifenslave.c
+++ b/Documentation/networking/ifenslave.c
--- a/Documentation/networking/packet_mmap.txt
+++ b/Documentation/networking/packet_mmap.txt
--- a/Documentation/networking/tc-actions-env-rules.txt
+++ b/Documentation/networking/tc-actions-env-rules.txt
--- a/Documentation/networking/udplite.txt
+++ b/Documentation/networking/udplite.txt
--- a/Documentation/pcmcia/Makefile
+++ b/Documentation/pcmcia/Makefile
--- a/Documentation/pcmcia/crc32hash.c
+++ b/Documentation/pcmcia/crc32hash.c
--- a/Documentation/power/00-INDEX
+++ b/Documentation/power/00-INDEX
--- a/Documentation/power/apm-acpi.txt
+++ b/Documentation/power/apm-acpi.txt
--- a/Documentation/power/pm.txt
+++ b/Documentation/power/pm.txt
--- a/Documentation/power/pm_qos_interface.txt
+++ b/Documentation/power/pm_qos_interface.txt
--- a/Documentation/power/power_supply_class.txt
+++ b/Documentation/power/power_supply_class.txt
--- a/Documentation/power/regulator/consumer.txt
+++ b/Documentation/power/regulator/consumer.txt
--- a/Documentation/power/regulator/machine.txt
+++ b/Documentation/power/regulator/machine.txt
--- a/Documentation/power/regulator/overview.txt
+++ b/Documentation/power/regulator/overview.txt
--- a/Show more
+++ b/Show more