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

2026-10-16 22:39:48 +00:00 · 2011-10-28 14:16:43 +09:00 · 2011-10-28 14:16:43 +09:00 · d4d9781d1d
commit d4d9781d1d
parent f5a18f932e 396e6e49c5
6070 changed files with 1272368 additions and 1209172 deletions
--- a/Documentation/ABI/removed/o2cb
+++ b/Documentation/ABI/removed/o2cb
--- a/Documentation/ABI/removed/raw1394
+++ b/Documentation/ABI/removed/raw1394
--- a/Documentation/ABI/testing/evm
+++ b/Documentation/ABI/testing/evm
--- a/Documentation/ABI/testing/sysfs-bus-bcma
+++ b/Documentation/ABI/testing/sysfs-bus-bcma
--- a/Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd
+++ b/Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
--- a/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
+++ b/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
--- a/Documentation/ABI/testing/sysfs-class-devfreq
+++ b/Documentation/ABI/testing/sysfs-class-devfreq
--- a/Documentation/ABI/testing/sysfs-class-net-mesh
+++ b/Documentation/ABI/testing/sysfs-class-net-mesh
--- a/Documentation/ABI/testing/sysfs-class-scsi_host
+++ b/Documentation/ABI/testing/sysfs-class-scsi_host
--- a/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
+++ b/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
--- a/Documentation/ABI/testing/sysfs-driver-wacom
+++ b/Documentation/ABI/testing/sysfs-driver-wacom
--- a/Documentation/ABI/testing/sysfs-wacom
+++ b/Documentation/ABI/testing/sysfs-wacom
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
--- a/Documentation/PCI/pci.txt
+++ b/Documentation/PCI/pci.txt
--- a/Documentation/RCU/NMI-RCU.txt
+++ b/Documentation/RCU/NMI-RCU.txt
--- a/Documentation/RCU/lockdep-splat.txt
+++ b/Documentation/RCU/lockdep-splat.txt
--- a/Documentation/RCU/lockdep.txt
+++ b/Documentation/RCU/lockdep.txt
--- a/Documentation/RCU/torture.txt
+++ b/Documentation/RCU/torture.txt
--- a/Documentation/RCU/trace.txt
+++ b/Documentation/RCU/trace.txt
--- a/Documentation/blackfin/bfin-gpio-notes.txt
+++ b/Documentation/blackfin/bfin-gpio-notes.txt
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
--- a/Documentation/bus-virt-phys-mapping.txt
+++ b/Documentation/bus-virt-phys-mapping.txt
--- a/Documentation/cdrom/packet-writing.txt
+++ b/Documentation/cdrom/packet-writing.txt
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
--- a/Documentation/development-process/4.Coding
+++ b/Documentation/development-process/4.Coding
--- a/Documentation/devicetree/bindings/arm/l2cc.txt
+++ b/Documentation/devicetree/bindings/arm/l2cc.txt
--- a/Documentation/devicetree/bindings/arm/primecell.txt
+++ b/Documentation/devicetree/bindings/arm/primecell.txt
--- a/Documentation/devicetree/bindings/gpio/led.txt
+++ b/Documentation/devicetree/bindings/gpio/led.txt
--- a/Documentation/devicetree/bindings/gpio/pl061-gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/pl061-gpio.txt
--- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
+++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
--- a/Documentation/devicetree/bindings/net/smsc911x.txt
+++ b/Documentation/devicetree/bindings/net/smsc911x.txt
--- a/Documentation/devicetree/bindings/serial/rs485.txt
+++ b/Documentation/devicetree/bindings/serial/rs485.txt
--- a/Documentation/devicetree/bindings/spi/spi_pl022.txt
+++ b/Documentation/devicetree/bindings/spi/spi_pl022.txt
--- a/Documentation/devicetree/bindings/tty/serial/atmel-usart.txt
+++ b/Documentation/devicetree/bindings/tty/serial/atmel-usart.txt
--- a/Documentation/devicetree/bindings/tty/serial/snps-dw-apb-uart.txt
+++ b/Documentation/devicetree/bindings/tty/serial/snps-dw-apb-uart.txt
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
--- a/Documentation/driver-model/binding.txt
+++ b/Documentation/driver-model/binding.txt
--- a/Documentation/driver-model/device.txt
+++ b/Documentation/driver-model/device.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/caching/object.txt
+++ b/Documentation/filesystems/caching/object.txt
--- a/Documentation/filesystems/locks.txt
+++ b/Documentation/filesystems/locks.txt
--- a/Documentation/filesystems/nfs/idmapper.txt
+++ b/Documentation/filesystems/nfs/idmapper.txt
--- a/Documentation/filesystems/pohmelfs/design_notes.txt
+++ b/Documentation/filesystems/pohmelfs/design_notes.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/frv/booting.txt
+++ b/Documentation/frv/booting.txt
--- a/Documentation/hwmon/ad7314
+++ b/Documentation/hwmon/ad7314
--- a/Documentation/hwmon/adm1275
+++ b/Documentation/hwmon/adm1275
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
--- a/Documentation/hwmon/exynos4_tmu
+++ b/Documentation/hwmon/exynos4_tmu
--- a/Documentation/hwmon/lm75
+++ b/Documentation/hwmon/lm75
--- a/Documentation/hwmon/ltc2978
+++ b/Documentation/hwmon/ltc2978
--- a/Documentation/hwmon/max16065
+++ b/Documentation/hwmon/max16065
--- a/Documentation/hwmon/pmbus
+++ b/Documentation/hwmon/pmbus
--- a/Documentation/hwmon/pmbus-core
+++ b/Documentation/hwmon/pmbus-core
--- a/Documentation/hwmon/zl6100
+++ b/Documentation/hwmon/zl6100
--- a/Documentation/input/elantech.txt
+++ b/Documentation/input/elantech.txt
--- a/Documentation/input/input.txt
+++ b/Documentation/input/input.txt
--- a/Documentation/input/multi-touch-protocol.txt
+++ b/Documentation/input/multi-touch-protocol.txt
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
--- a/Documentation/media-framework.txt
+++ b/Documentation/media-framework.txt
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
--- a/Documentation/networking/dmfe.txt
+++ b/Documentation/networking/dmfe.txt
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/networking/mac80211-injection.txt
+++ b/Documentation/networking/mac80211-injection.txt
--- a/Documentation/networking/netdevices.txt
+++ b/Documentation/networking/netdevices.txt
--- a/Documentation/networking/scaling.txt
+++ b/Documentation/networking/scaling.txt
--- a/Documentation/networking/stmmac.txt
+++ b/Documentation/networking/stmmac.txt
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
--- a/Documentation/power/00-INDEX
+++ b/Documentation/power/00-INDEX
--- a/Documentation/power/basic-pm-debugging.txt
+++ b/Documentation/power/basic-pm-debugging.txt
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
--- a/Documentation/power/pm_qos_interface.txt
+++ b/Documentation/power/pm_qos_interface.txt
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
--- a/Documentation/power/suspend-and-cpuhotplug.txt
+++ b/Documentation/power/suspend-and-cpuhotplug.txt
--- a/Documentation/power/userland-swsusp.txt
+++ b/Documentation/power/userland-swsusp.txt
--- a/Documentation/rfkill.txt
+++ b/Documentation/rfkill.txt
--- a/Documentation/scheduler/sched-bwc.txt
+++ b/Documentation/scheduler/sched-bwc.txt
--- a/Documentation/scsi/aic7xxx_old.txt
+++ b/Documentation/scsi/aic7xxx_old.txt
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
--- a/Documentation/security/keys-trusted-encrypted.txt
+++ b/Documentation/security/keys-trusted-encrypted.txt
--- a/Documentation/serial/serial-rs485.txt
+++ b/Documentation/serial/serial-rs485.txt
--- a/Documentation/sound/oss/PAS16
+++ b/Documentation/sound/oss/PAS16
--- a/Documentation/spi/pxa2xx
+++ b/Documentation/spi/pxa2xx
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
--- a/Documentation/timers/highres.txt
+++ b/Documentation/timers/highres.txt
--- a/Documentation/usb/dma.txt
+++ b/Documentation/usb/dma.txt
--- a/Documentation/usb/dwc3.txt
+++ b/Documentation/usb/dwc3.txt
--- a/Documentation/usb/power-management.txt
+++ b/Documentation/usb/power-management.txt
--- a/Documentation/virtual/lguest/lguest.c
+++ b/Documentation/virtual/lguest/lguest.c
--- a/Show more
+++ b/Show more