Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-10-14 05:55:17 +00:00 · 2011-05-24 15:32:20 +09:00 · 2011-05-24 15:32:20 +09:00 · 9fb4c7fbbc
commit 9fb4c7fbbc
parent dc3e5b6a6e d762f43831
5678 changed files with 390158 additions and 377916 deletions
--- a/2
+++ b/2
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus
+++ b/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus
--- a/Documentation/ABI/testing/sysfs-bus-bcma
+++ b/Documentation/ABI/testing/sysfs-bus-bcma
--- a/Documentation/ABI/testing/sysfs-bus-pci
+++ b/Documentation/ABI/testing/sysfs-bus-pci
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
--- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
--- a/Documentation/ABI/testing/sysfs-firmware-dmi
+++ b/Documentation/ABI/testing/sysfs-firmware-dmi
--- a/Documentation/ABI/testing/sysfs-firmware-gsmi
+++ b/Documentation/ABI/testing/sysfs-firmware-gsmi
--- a/Documentation/ABI/testing/sysfs-firmware-log
+++ b/Documentation/ABI/testing/sysfs-firmware-log
--- a/Documentation/ABI/testing/sysfs-kernel-fscaps
+++ b/Documentation/ABI/testing/sysfs-kernel-fscaps
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
--- a/Documentation/DocBook/.gitignore
+++ b/Documentation/DocBook/.gitignore
--- 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/dvbproperty.xml
+++ b/Documentation/DocBook/dvb/dvbproperty.xml
--- a/Documentation/DocBook/dvb/frontend.h.xml
+++ b/Documentation/DocBook/dvb/frontend.h.xml
--- a/Documentation/DocBook/genericirq.tmpl
+++ b/Documentation/DocBook/genericirq.tmpl
--- a/Documentation/DocBook/media-entities.tmpl
+++ b/Documentation/DocBook/media-entities.tmpl
--- a/Documentation/DocBook/v4l/media-ioc-setup-link.xml
+++ b/Documentation/DocBook/v4l/media-ioc-setup-link.xml
--- a/Documentation/DocBook/v4l/pixfmt-m420.xml
+++ b/Documentation/DocBook/v4l/pixfmt-m420.xml
--- a/Documentation/DocBook/v4l/pixfmt-y10b.xml
+++ b/Documentation/DocBook/v4l/pixfmt-y10b.xml
--- a/Documentation/DocBook/v4l/pixfmt-y12.xml
+++ b/Documentation/DocBook/v4l/pixfmt-y12.xml
--- a/Documentation/DocBook/v4l/pixfmt.xml
+++ b/Documentation/DocBook/v4l/pixfmt.xml
--- a/Documentation/DocBook/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/v4l/subdev-formats.xml
--- a/Documentation/DocBook/v4l/videodev2.h.xml
+++ b/Documentation/DocBook/v4l/videodev2.h.xml
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/RCU/00-INDEX
+++ b/Documentation/RCU/00-INDEX
--- a/Documentation/RCU/stallwarn.txt
+++ b/Documentation/RCU/stallwarn.txt
--- a/Documentation/RCU/trace.txt
+++ b/Documentation/RCU/trace.txt
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
--- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
+++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
--- a/Documentation/devicetree/bindings/powerpc/fsl/ifc.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/ifc.txt
--- a/Documentation/devicetree/bindings/powerpc/fsl/mpic-timer.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/mpic-timer.txt
--- a/Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
--- a/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt
+++ b/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
--- a/Documentation/driver-model/bus.txt
+++ b/Documentation/driver-model/bus.txt
--- a/Documentation/driver-model/class.txt
+++ b/Documentation/driver-model/class.txt
--- a/Documentation/driver-model/device.txt
+++ b/Documentation/driver-model/device.txt
--- a/Documentation/driver-model/driver.txt
+++ b/Documentation/driver-model/driver.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/flexible-arrays.txt
+++ b/Documentation/flexible-arrays.txt
--- a/Documentation/hid/hiddev.txt
+++ b/Documentation/hid/hiddev.txt
--- a/Documentation/hid/hidraw.txt
+++ b/Documentation/hid/hidraw.txt
--- a/Documentation/hwmon/adm1021
+++ b/Documentation/hwmon/adm1021
--- a/Documentation/hwmon/adm1275
+++ b/Documentation/hwmon/adm1275
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
--- a/Documentation/hwmon/lm90
+++ b/Documentation/hwmon/lm90
--- a/Documentation/hwmon/max16064
+++ b/Documentation/hwmon/max16064
--- a/Documentation/hwmon/max16065
+++ b/Documentation/hwmon/max16065
--- a/Documentation/hwmon/max34440
+++ b/Documentation/hwmon/max34440
--- a/Documentation/hwmon/max6642
+++ b/Documentation/hwmon/max6642
--- a/Documentation/hwmon/max8688
+++ b/Documentation/hwmon/max8688
--- a/Documentation/hwmon/pkgtemp
+++ b/Documentation/hwmon/pkgtemp
--- a/Documentation/hwmon/pmbus
+++ b/Documentation/hwmon/pmbus
--- a/Documentation/hwmon/sht15
+++ b/Documentation/hwmon/sht15
--- a/Documentation/hwmon/smm665
+++ b/Documentation/hwmon/smm665
--- a/Documentation/hwmon/submitting-patches
+++ b/Documentation/hwmon/submitting-patches
--- a/Documentation/hwmon/ucd9000
+++ b/Documentation/hwmon/ucd9000
--- a/Documentation/hwmon/ucd9200
+++ b/Documentation/hwmon/ucd9200
--- a/Documentation/input/event-codes.txt
+++ b/Documentation/input/event-codes.txt
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
--- a/Documentation/ja_JP/HOWTO
+++ b/Documentation/ja_JP/HOWTO
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
--- 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/igb.txt
+++ b/Documentation/networking/igb.txt
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
--- a/Documentation/power/notifiers.txt
+++ b/Documentation/power/notifiers.txt
--- a/Documentation/pti/pti_intel_mid.txt
+++ b/Documentation/pti/pti_intel_mid.txt
--- a/Documentation/scsi/LICENSE.qla2xxx
+++ b/Documentation/scsi/LICENSE.qla2xxx
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
--- a/Documentation/sound/alsa/SB-Live-mixer.txt
+++ b/Documentation/sound/alsa/SB-Live-mixer.txt
--- a/Documentation/stable_api_nonsense.txt
+++ b/Documentation/stable_api_nonsense.txt
--- a/Documentation/sysctl/fs.txt
+++ b/Documentation/sysctl/fs.txt
--- a/Documentation/sysctl/net.txt
+++ b/Documentation/sysctl/net.txt
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
--- a/Documentation/timers/timers-howto.txt
+++ b/Documentation/timers/timers-howto.txt
--- a/Documentation/trace/kprobetrace.txt
+++ b/Documentation/trace/kprobetrace.txt
--- a/Documentation/usb/callbacks.txt
+++ b/Documentation/usb/callbacks.txt
--- a/Documentation/usb/linux-cdc-acm.inf
+++ b/Documentation/usb/linux-cdc-acm.inf
--- a/Documentation/usb/linux.inf
+++ b/Documentation/usb/linux.inf
--- a/Documentation/vgaarbiter.txt
+++ b/Documentation/vgaarbiter.txt
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
--- a/Documentation/video4linux/Zoran
+++ b/Documentation/video4linux/Zoran
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
--- a/Documentation/video4linux/sh_mobile_ceu_camera.txt
+++ b/Documentation/video4linux/sh_mobile_ceu_camera.txt
--- a/Documentation/video4linux/uvcvideo.txt
+++ b/Documentation/video4linux/uvcvideo.txt
--- a/Documentation/virtual/00-INDEX
+++ b/Documentation/virtual/00-INDEX
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
--- a/Documentation/virtual/kvm/cpuid.txt
+++ b/Documentation/virtual/kvm/cpuid.txt
--- a/Documentation/virtual/kvm/locking.txt
+++ b/Documentation/virtual/kvm/locking.txt
--- a/Documentation/virtual/kvm/mmu.txt
+++ b/Documentation/virtual/kvm/mmu.txt
--- a/Documentation/virtual/kvm/msr.txt
+++ b/Documentation/virtual/kvm/msr.txt
--- a/Show more
+++ b/Show more