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

2026-09-18 18:15:59 +00:00 · 2008-07-23 15:19:00 +02:00 · 2008-07-23 15:19:00 +02:00 · 9063974cdb
commit 9063974cdb
parent d6d6a86e14 c010b2f76c
6720 changed files with 582418 additions and 512703 deletions
--- a/3
+++ b/3
--- a/Documentation/ABI/testing/sysfs-block
+++ b/Documentation/ABI/testing/sysfs-block
--- a/Documentation/ABI/testing/sysfs-bus-css
+++ b/Documentation/ABI/testing/sysfs-bus-css
--- a/Documentation/ABI/testing/sysfs-dev
+++ b/Documentation/ABI/testing/sysfs-dev
--- a/Documentation/ABI/testing/sysfs-firmware-acpi
+++ b/Documentation/ABI/testing/sysfs-firmware-acpi
--- a/Documentation/ABI/testing/sysfs-firmware-memmap
+++ b/Documentation/ABI/testing/sysfs-firmware-memmap
--- a/Documentation/DMA-attributes.txt
+++ b/Documentation/DMA-attributes.txt
--- a/Documentation/DocBook/gadget.tmpl
+++ b/Documentation/DocBook/gadget.tmpl
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/IRQ-affinity.txt
+++ b/Documentation/IRQ-affinity.txt
--- a/Documentation/RCU/NMI-RCU.txt
+++ b/Documentation/RCU/NMI-RCU.txt
--- a/Documentation/RCU/RTFP.txt
+++ b/Documentation/RCU/RTFP.txt
--- a/Documentation/RCU/checklist.txt
+++ b/Documentation/RCU/checklist.txt
--- a/Documentation/RCU/torture.txt
+++ b/Documentation/RCU/torture.txt
--- a/Documentation/RCU/whatisRCU.txt
+++ b/Documentation/RCU/whatisRCU.txt
--- a/Documentation/block/data-integrity.txt
+++ b/Documentation/block/data-integrity.txt
--- a/Documentation/cputopology.txt
+++ b/Documentation/cputopology.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/bfs.txt
+++ b/Documentation/filesystems/bfs.txt
--- a/Documentation/filesystems/configfs/configfs_example.c
+++ b/Documentation/filesystems/configfs/configfs_example.c
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
--- a/Documentation/filesystems/gfs2-glocks.txt
+++ b/Documentation/filesystems/gfs2-glocks.txt
--- a/Documentation/filesystems/nfs-rdma.txt
+++ b/Documentation/filesystems/nfs-rdma.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
--- a/Documentation/filesystems/ubifs.txt
+++ b/Documentation/filesystems/ubifs.txt
--- a/Documentation/ftrace.txt
+++ b/Documentation/ftrace.txt
--- a/Documentation/i2c/busses/i2c-i810
+++ b/Documentation/i2c/busses/i2c-i810
--- a/Documentation/i2c/busses/i2c-prosavage
+++ b/Documentation/i2c/busses/i2c-prosavage
--- a/Documentation/i2c/busses/i2c-savage4
+++ b/Documentation/i2c/busses/i2c-savage4
--- a/Documentation/i2c/chips/max6875
+++ b/Documentation/i2c/chips/max6875
--- a/Documentation/i2c/chips/pca9539
+++ b/Documentation/i2c/chips/pca9539
--- a/Documentation/i2c/chips/pcf8574
+++ b/Documentation/i2c/chips/pcf8574
--- a/Documentation/i2c/chips/pcf8575
+++ b/Documentation/i2c/chips/pcf8575
--- a/Documentation/i2c/fault-codes
+++ b/Documentation/i2c/fault-codes
--- a/Documentation/i2c/smbus-protocol
+++ b/Documentation/i2c/smbus-protocol
--- a/Documentation/i2c/writing-clients
+++ b/Documentation/i2c/writing-clients
--- a/Documentation/ia64/paravirt_ops.txt
+++ b/Documentation/ia64/paravirt_ops.txt
--- a/Documentation/input/gameport-programming.txt
+++ b/Documentation/input/gameport-programming.txt
--- a/Documentation/input/input.txt
+++ b/Documentation/input/input.txt
--- a/Documentation/input/joystick-api.txt
+++ b/Documentation/input/joystick-api.txt
--- a/Documentation/input/joystick-parport.txt
+++ b/Documentation/input/joystick-parport.txt
--- a/Documentation/input/joystick.txt
+++ b/Documentation/input/joystick.txt
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
--- a/Documentation/ioctl/hdio.txt
+++ b/Documentation/ioctl/hdio.txt
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
--- a/Documentation/laptops/acer-wmi.txt
+++ b/Documentation/laptops/acer-wmi.txt
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
--- a/Documentation/networking/dm9000.txt
+++ b/Documentation/networking/dm9000.txt
--- a/Documentation/networking/e1000.txt
+++ b/Documentation/networking/e1000.txt
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/networking/ixgb.txt
+++ b/Documentation/networking/ixgb.txt
--- a/Documentation/networking/mac80211_hwsim/README
+++ b/Documentation/networking/mac80211_hwsim/README
--- a/Documentation/networking/mac80211_hwsim/hostapd.conf
+++ b/Documentation/networking/mac80211_hwsim/hostapd.conf
--- a/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf
+++ b/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf
--- a/Documentation/networking/multiqueue.txt
+++ b/Documentation/networking/multiqueue.txt
--- a/Documentation/networking/s2io.txt
+++ b/Documentation/networking/s2io.txt
--- a/Documentation/networking/udplite.txt
+++ b/Documentation/networking/udplite.txt
--- a/Documentation/nmi_watchdog.txt
+++ b/Documentation/nmi_watchdog.txt
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/Documentation/powerpc/bootwrapper.txt
+++ b/Documentation/powerpc/bootwrapper.txt
--- a/Documentation/powerpc/dts-bindings/fsl/board.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/board.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/brg.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/brg.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/i2c.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/i2c.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/pic.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/pic.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/usb.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/usb.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/network.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/network.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/par_io.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/par_io.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/pincfg.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/pincfg.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/ucc.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/ucc.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt
--- a/Documentation/powerpc/dts-bindings/fsl/diu.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/diu.txt
--- a/Documentation/powerpc/dts-bindings/fsl/dma.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/dma.txt
--- a/Documentation/powerpc/dts-bindings/fsl/gtm.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/gtm.txt
--- a/Documentation/powerpc/dts-bindings/fsl/guts.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/guts.txt
--- a/Documentation/powerpc/dts-bindings/fsl/i2c.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/i2c.txt
--- a/Documentation/powerpc/dts-bindings/fsl/lbc.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/lbc.txt
--- a/Documentation/powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt
--- a/Documentation/powerpc/dts-bindings/fsl/msi-pic.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/msi-pic.txt
--- a/Documentation/powerpc/dts-bindings/fsl/pmc.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/pmc.txt
--- a/Documentation/powerpc/dts-bindings/fsl/sata.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/sata.txt
--- a/Documentation/powerpc/dts-bindings/fsl/sec.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/sec.txt
--- a/Documentation/powerpc/dts-bindings/fsl/spi.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/spi.txt
--- a/Documentation/powerpc/dts-bindings/fsl/ssi.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/ssi.txt
--- a/Documentation/powerpc/dts-bindings/fsl/tsec.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/tsec.txt
--- a/Documentation/powerpc/dts-bindings/fsl/upm-nand.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/upm-nand.txt
--- a/Documentation/powerpc/dts-bindings/fsl/usb.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/usb.txt
--- a/Documentation/powerpc/dts-bindings/gpio/led.txt
+++ b/Documentation/powerpc/dts-bindings/gpio/led.txt
--- a/Documentation/rfkill.txt
+++ b/Documentation/rfkill.txt
--- a/Documentation/scheduler/sched-domains.txt
+++ b/Documentation/scheduler/sched-domains.txt
--- a/Documentation/scheduler/sched-rt-group.txt
+++ b/Documentation/scheduler/sched-rt-group.txt
--- a/Show more
+++ b/Show more