Staging: merge 2.6.39-rc3 into staging-next

This was done to handle a number of conflicts, the majority of which were caused by the big "fix spelling issues" patch. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2026-10-16 22:39:48 +00:00 · 2011-04-13 12:14:05 -07:00 · 2011-04-13 12:14:05 -07:00 · 32235b07b5
commit 32235b07b5
parent 59c23eabda a6360dd37e
3012 changed files with 10241 additions and 9947 deletions
--- a/6
+++ b/6
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/ABI/testing/sysfs-bus-css
+++ b/Documentation/ABI/testing/sysfs-bus-css
--- a/Documentation/ABI/testing/sysfs-class-led
+++ b/Documentation/ABI/testing/sysfs-class-led
--- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
--- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
--- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus
--- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra
--- a/Documentation/ABI/testing/sysfs-platform-asus-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-asus-laptop
--- a/Documentation/DocBook/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/dvb/dvbproperty.xml
--- a/Documentation/DocBook/dvb/frontend.xml
+++ b/Documentation/DocBook/dvb/frontend.xml
--- a/Documentation/DocBook/kernel-locking.tmpl
+++ b/Documentation/DocBook/kernel-locking.tmpl
--- a/Documentation/DocBook/libata.tmpl
+++ b/Documentation/DocBook/libata.tmpl
--- a/Documentation/DocBook/mtdnand.tmpl
+++ b/Documentation/DocBook/mtdnand.tmpl
--- a/Documentation/DocBook/regulator.tmpl
+++ b/Documentation/DocBook/regulator.tmpl
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
--- a/Documentation/DocBook/usb.tmpl
+++ b/Documentation/DocBook/usb.tmpl
--- a/Documentation/DocBook/v4l/common.xml
+++ b/Documentation/DocBook/v4l/common.xml
--- a/Documentation/DocBook/v4l/controls.xml
+++ b/Documentation/DocBook/v4l/controls.xml
--- a/Documentation/DocBook/v4l/dev-subdev.xml
+++ b/Documentation/DocBook/v4l/dev-subdev.xml
--- a/Documentation/DocBook/v4l/libv4l.xml
+++ b/Documentation/DocBook/v4l/libv4l.xml
--- a/Documentation/DocBook/v4l/remote_controllers.xml
+++ b/Documentation/DocBook/v4l/remote_controllers.xml
--- a/Documentation/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl
--- a/Documentation/PCI/MSI-HOWTO.txt
+++ b/Documentation/PCI/MSI-HOWTO.txt
--- a/Documentation/SecurityBugs
+++ b/Documentation/SecurityBugs
--- a/Documentation/SubmittingDrivers
+++ b/Documentation/SubmittingDrivers
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/arm/IXP4xx
+++ b/Documentation/arm/IXP4xx
--- a/Documentation/arm/Samsung-S3C24XX/Suspend.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Suspend.txt
--- a/Documentation/arm/Samsung/GPIO.txt
+++ b/Documentation/arm/Samsung/GPIO.txt
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
--- a/Documentation/dell_rbu.txt
+++ b/Documentation/dell_rbu.txt
--- a/Documentation/device-mapper/dm-service-time.txt
+++ b/Documentation/device-mapper/dm-service-time.txt
--- a/Documentation/devicetree/bindings/fb/sm501fb.txt
+++ b/Documentation/devicetree/bindings/fb/sm501fb.txt
--- a/Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt
--- a/Documentation/devicetree/bindings/net/can/sja1000.txt
+++ b/Documentation/devicetree/bindings/net/can/sja1000.txt
--- a/Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
--- a/Documentation/devicetree/booting-without-of.txt
+++ b/Documentation/devicetree/booting-without-of.txt
--- a/Documentation/dvb/README.dvb-usb
+++ b/Documentation/dvb/README.dvb-usb
--- a/Documentation/dvb/ci.txt
+++ b/Documentation/dvb/ci.txt
--- a/Documentation/dvb/faq.txt
+++ b/Documentation/dvb/faq.txt
--- a/Documentation/dvb/udev.txt
+++ b/Documentation/dvb/udev.txt
--- a/Documentation/edac.txt
+++ b/Documentation/edac.txt
--- a/Documentation/eisa.txt
+++ b/Documentation/eisa.txt
--- a/Documentation/fb/viafb.txt
+++ b/Documentation/fb/viafb.txt
--- a/Documentation/filesystems/autofs4-mount-control.txt
+++ b/Documentation/filesystems/autofs4-mount-control.txt
--- a/Documentation/filesystems/caching/netfs-api.txt
+++ b/Documentation/filesystems/caching/netfs-api.txt
--- a/Documentation/filesystems/configfs/configfs.txt
+++ b/Documentation/filesystems/configfs/configfs.txt
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
--- a/Documentation/filesystems/gfs2-uevents.txt
+++ b/Documentation/filesystems/gfs2-uevents.txt
--- a/Documentation/filesystems/gfs2.txt
+++ b/Documentation/filesystems/gfs2.txt
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
--- a/Documentation/filesystems/ocfs2.txt
+++ b/Documentation/filesystems/ocfs2.txt
--- a/Documentation/filesystems/path-lookup.txt
+++ b/Documentation/filesystems/path-lookup.txt
--- a/Documentation/filesystems/pohmelfs/network_protocol.txt
+++ b/Documentation/filesystems/pohmelfs/network_protocol.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/squashfs.txt
+++ b/Documentation/filesystems/squashfs.txt
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/filesystems/xfs-delayed-logging-design.txt
+++ b/Documentation/filesystems/xfs-delayed-logging-design.txt
--- a/Documentation/hwmon/abituguru
+++ b/Documentation/hwmon/abituguru
--- a/Documentation/hwmon/abituguru-datasheet
+++ b/Documentation/hwmon/abituguru-datasheet
--- a/Documentation/hwmon/abituguru3
+++ b/Documentation/hwmon/abituguru3
--- a/Documentation/hwmon/pmbus
+++ b/Documentation/hwmon/pmbus
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
--- a/Documentation/hwmon/w83781d
+++ b/Documentation/hwmon/w83781d
--- a/Documentation/hwmon/w83791d
+++ b/Documentation/hwmon/w83791d
--- a/Documentation/i2c/busses/i2c-parport-light
+++ b/Documentation/i2c/busses/i2c-parport-light
--- a/Documentation/i2c/busses/i2c-sis96x
+++ b/Documentation/i2c/busses/i2c-sis96x
--- a/Documentation/i2c/busses/i2c-taos-evm
+++ b/Documentation/i2c/busses/i2c-taos-evm
--- a/Documentation/i2o/README
+++ b/Documentation/i2o/README
--- a/Documentation/ia64/aliasing-test.c
+++ b/Documentation/ia64/aliasing-test.c
--- a/Documentation/input/joystick-parport.txt
+++ b/Documentation/input/joystick-parport.txt
--- a/Documentation/input/rotary-encoder.txt
+++ b/Documentation/input/rotary-encoder.txt
--- a/Documentation/input/walkera0701.txt
+++ b/Documentation/input/walkera0701.txt
--- a/Documentation/irqflags-tracing.txt
+++ b/Documentation/irqflags-tracing.txt
--- a/Documentation/isdn/INTERFACE.CAPI
+++ b/Documentation/isdn/INTERFACE.CAPI
--- a/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/kmemleak.txt
+++ b/Documentation/kmemleak.txt
--- a/Documentation/kvm/mmu.txt
+++ b/Documentation/kvm/mmu.txt
--- a/Documentation/kvm/ppc-pv.txt
+++ b/Documentation/kvm/ppc-pv.txt
--- a/Documentation/kvm/timekeeping.txt
+++ b/Documentation/kvm/timekeeping.txt
--- a/Documentation/laptops/asus-laptop.txt
+++ b/Documentation/laptops/asus-laptop.txt
--- a/Documentation/leds/00-INDEX
+++ b/Documentation/leds/00-INDEX
--- a/Documentation/leds/leds-class.txt
+++ b/Documentation/leds/leds-class.txt
--- a/Documentation/leds/leds-lp3944.txt
+++ b/Documentation/leds/leds-lp3944.txt
--- a/Documentation/media-framework.txt
+++ b/Documentation/media-framework.txt
--- a/Documentation/mips/AU1xxx_IDE.README
+++ b/Documentation/mips/AU1xxx_IDE.README
--- a/Documentation/misc-devices/ics932s401
+++ b/Documentation/misc-devices/ics932s401
--- a/Documentation/networking/3c359.txt
+++ b/Documentation/networking/3c359.txt
--- a/Documentation/networking/README.ipw2200
+++ b/Documentation/networking/README.ipw2200
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
--- a/Documentation/networking/caif/Linux-CAIF.txt
+++ b/Documentation/networking/caif/Linux-CAIF.txt
--- a/Documentation/networking/caif/spi_porting.txt
+++ b/Documentation/networking/caif/spi_porting.txt
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
--- a/Documentation/networking/ieee802154.txt
+++ b/Documentation/networking/ieee802154.txt
--- a/Show more
+++ b/Show more