Merge branch 'topic/isa' into topic/misc

2026-10-14 05:55:17 +00:00 · 2010-08-18 15:17:30 +02:00 · 2010-08-18 15:17:30 +02:00 · 6ab561c8aa
commit 6ab561c8aa
parent 4f4e8f6989 cbaa9f60d5
6509 changed files with 465415 additions and 376517 deletions
--- a/Documentation/ABI/testing/debugfs-ec
+++ b/Documentation/ABI/testing/debugfs-ec
--- a/Documentation/ABI/testing/debugfs-kmemtrace
+++ b/Documentation/ABI/testing/debugfs-kmemtrace
--- a/Documentation/ABI/testing/sysfs-bus-i2c-devices-hm6352
+++ b/Documentation/ABI/testing/sysfs-bus-i2c-devices-hm6352
--- a/Documentation/ABI/testing/sysfs-bus-pci
+++ b/Documentation/ABI/testing/sysfs-bus-pci
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
--- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
--- a/Documentation/ABI/testing/sysfs-i2c-bmp085
+++ b/Documentation/ABI/testing/sysfs-i2c-bmp085
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
--- a/Documentation/Changes
+++ b/Documentation/Changes
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
--- a/Documentation/DocBook/dvb/dvbapi.xml
+++ b/Documentation/DocBook/dvb/dvbapi.xml
--- a/Documentation/DocBook/dvb/frontend.h.xml
+++ b/Documentation/DocBook/dvb/frontend.h.xml
--- a/Documentation/DocBook/dvb/frontend.xml
+++ b/Documentation/DocBook/dvb/frontend.xml
--- a/Documentation/DocBook/kgdb.tmpl
+++ b/Documentation/DocBook/kgdb.tmpl
--- a/Documentation/DocBook/media-entities.tmpl
+++ b/Documentation/DocBook/media-entities.tmpl
--- a/Documentation/DocBook/media.tmpl
+++ b/Documentation/DocBook/media.tmpl
--- a/Documentation/DocBook/scsi.tmpl
+++ b/Documentation/DocBook/scsi.tmpl
--- a/Documentation/DocBook/stylesheet.xsl
+++ b/Documentation/DocBook/stylesheet.xsl
--- a/Documentation/DocBook/v4l/compat.xml
+++ b/Documentation/DocBook/v4l/compat.xml
--- a/Documentation/DocBook/v4l/fdl-appendix.xml
+++ b/Documentation/DocBook/v4l/fdl-appendix.xml
--- a/Documentation/DocBook/v4l/lirc_device_interface.xml
+++ b/Documentation/DocBook/v4l/lirc_device_interface.xml
--- a/Documentation/DocBook/v4l/remote_controllers.xml
+++ b/Documentation/DocBook/v4l/remote_controllers.xml
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/PCI/pci.txt
+++ b/Documentation/PCI/pci.txt
--- a/Documentation/RCU/RTFP.txt
+++ b/Documentation/RCU/RTFP.txt
--- a/Documentation/SubmittingDrivers
+++ b/Documentation/SubmittingDrivers
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/aoe/aoe.txt
+++ b/Documentation/aoe/aoe.txt
--- a/Documentation/apparmor.txt
+++ b/Documentation/apparmor.txt
--- a/Documentation/arm/IXP2000
+++ b/Documentation/arm/IXP2000
--- a/Documentation/arm/IXP4xx
+++ b/Documentation/arm/IXP4xx
--- a/Documentation/arm/README
+++ b/Documentation/arm/README
--- a/Documentation/arm/SA1100/Assabet
+++ b/Documentation/arm/SA1100/Assabet
--- a/Documentation/arm/SA1100/Brutus
+++ b/Documentation/arm/SA1100/Brutus
--- a/Documentation/arm/SA1100/FreeBird
+++ b/Documentation/arm/SA1100/FreeBird
--- a/Documentation/arm/SA1100/GraphicsClient
+++ b/Documentation/arm/SA1100/GraphicsClient
--- a/Documentation/arm/SA1100/GraphicsMaster
+++ b/Documentation/arm/SA1100/GraphicsMaster
--- a/Documentation/arm/SA1100/Itsy
+++ b/Documentation/arm/SA1100/Itsy
--- a/Documentation/arm/SA1100/PLEB
+++ b/Documentation/arm/SA1100/PLEB
--- a/Documentation/arm/SA1100/Victor
+++ b/Documentation/arm/SA1100/Victor
--- a/Documentation/arm/SA1100/nanoEngine
+++ b/Documentation/arm/SA1100/nanoEngine
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
--- a/Documentation/arm/tcm.txt
+++ b/Documentation/arm/tcm.txt
--- a/Documentation/binfmt_misc.txt
+++ b/Documentation/binfmt_misc.txt
--- a/Documentation/blackfin/00-INDEX
+++ b/Documentation/blackfin/00-INDEX
--- a/Documentation/blackfin/Filesystems
+++ b/Documentation/blackfin/Filesystems
--- a/Documentation/blackfin/bfin-spi-notes.txt
+++ b/Documentation/blackfin/bfin-spi-notes.txt
--- a/Documentation/blackfin/cachefeatures.txt
+++ b/Documentation/blackfin/cachefeatures.txt
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
--- a/Documentation/blockdev/paride.txt
+++ b/Documentation/blockdev/paride.txt
--- a/Documentation/cdrom/packet-writing.txt
+++ b/Documentation/cdrom/packet-writing.txt
--- a/Documentation/cgroups/cpusets.txt
+++ b/Documentation/cgroups/cpusets.txt
--- a/Documentation/coccinelle.txt
+++ b/Documentation/coccinelle.txt
--- a/Documentation/development-process/4.Coding
+++ b/Documentation/development-process/4.Coding
--- a/Documentation/device-mapper/dm-crypt.txt
+++ b/Documentation/device-mapper/dm-crypt.txt
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
--- a/Documentation/dvb/faq.txt
+++ b/Documentation/dvb/faq.txt
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
--- a/Documentation/fb/framebuffer.txt
+++ b/Documentation/fb/framebuffer.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/9p.txt
+++ b/Documentation/filesystems/9p.txt
--- a/Documentation/filesystems/affs.txt
+++ b/Documentation/filesystems/affs.txt
--- a/Documentation/filesystems/befs.txt
+++ b/Documentation/filesystems/befs.txt
--- a/Documentation/filesystems/caching/fscache.txt
+++ b/Documentation/filesystems/caching/fscache.txt
--- a/Documentation/filesystems/isofs.txt
+++ b/Documentation/filesystems/isofs.txt
--- a/Documentation/filesystems/nfs/nfsroot.txt
+++ b/Documentation/filesystems/nfs/nfsroot.txt
--- a/Documentation/filesystems/nilfs2.txt
+++ b/Documentation/filesystems/nilfs2.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/sysfs-pci.txt
+++ b/Documentation/filesystems/sysfs-pci.txt
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
--- a/Documentation/filesystems/xfs.txt
+++ b/Documentation/filesystems/xfs.txt
--- a/Documentation/firmware_class/hotplug-script
+++ b/Documentation/firmware_class/hotplug-script
--- a/Documentation/hwmon/adm1026
+++ b/Documentation/hwmon/adm1026
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
--- a/Documentation/hwmon/f71882fg
+++ b/Documentation/hwmon/f71882fg
--- a/Documentation/hwmon/g760a
+++ b/Documentation/hwmon/g760a
--- a/Documentation/hwmon/gl518sm
+++ b/Documentation/hwmon/gl518sm
--- a/Documentation/hwmon/hpfall.c
+++ b/Documentation/hwmon/hpfall.c
--- a/Documentation/hwmon/jc42
+++ b/Documentation/hwmon/jc42
--- a/Documentation/hwmon/k8temp
+++ b/Documentation/hwmon/k8temp
--- a/Documentation/hwmon/lm85
+++ b/Documentation/hwmon/lm85
--- a/Documentation/hwmon/pkgtemp
+++ b/Documentation/hwmon/pkgtemp
--- a/Documentation/hwmon/smm665
+++ b/Documentation/hwmon/smm665
--- a/Documentation/hwmon/smsc47m1
+++ b/Documentation/hwmon/smsc47m1
--- a/Documentation/hwmon/thmc50
+++ b/Documentation/hwmon/thmc50
--- a/Documentation/hwmon/via686a
+++ b/Documentation/hwmon/via686a
--- a/Documentation/hwmon/w83627hf
+++ b/Documentation/hwmon/w83627hf
--- a/Documentation/hwmon/w83781d
+++ b/Documentation/hwmon/w83781d
--- a/Documentation/hwmon/w83792d
+++ b/Documentation/hwmon/w83792d
--- a/Documentation/i2c/busses/i2c-ali1535
+++ b/Documentation/i2c/busses/i2c-ali1535
--- a/Documentation/i2c/busses/i2c-ali1563
+++ b/Documentation/i2c/busses/i2c-ali1563
--- a/Documentation/i2c/busses/i2c-ali15x3
+++ b/Documentation/i2c/busses/i2c-ali15x3
--- a/Documentation/i2c/busses/i2c-piix4
+++ b/Documentation/i2c/busses/i2c-piix4
--- a/Documentation/i2c/busses/i2c-sis630
+++ b/Documentation/i2c/busses/i2c-sis630
--- a/Documentation/ia64/aliasing.txt
+++ b/Documentation/ia64/aliasing.txt
--- a/Documentation/ia64/serial.txt
+++ b/Documentation/ia64/serial.txt
--- a/Documentation/infiniband/user_verbs.txt
+++ b/Documentation/infiniband/user_verbs.txt
--- a/Documentation/input/appletouch.txt
+++ b/Documentation/input/appletouch.txt
--- a/Show more
+++ b/Show more