Merge branch 'master' into next

2026-11-13 07:31:07 +00:00 · 2010-03-31 08:39:27 +11:00 · 2010-03-31 08:39:27 +11:00 · d25d6fa1a9
commit d25d6fa1a9
parent 225a9be24d 2eaa9cfdf3
4213 changed files with 256708 additions and 134676 deletions
--- a/Documentation/ABI/stable/sysfs-devices-node
+++ b/Documentation/ABI/stable/sysfs-devices-node
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
--- a/Documentation/PCI/PCI-DMA-mapping.txt
+++ b/Documentation/PCI/PCI-DMA-mapping.txt
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
--- a/Documentation/DocBook/mtdnand.tmpl
+++ b/Documentation/DocBook/mtdnand.tmpl
--- a/Documentation/DocBook/v4l/common.xml
+++ b/Documentation/DocBook/v4l/common.xml
--- a/Documentation/DocBook/v4l/vidioc-g-parm.xml
+++ b/Documentation/DocBook/v4l/vidioc-g-parm.xml
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/IPMI.txt
+++ b/Documentation/IPMI.txt
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
--- a/Documentation/SubmitChecklist
+++ b/Documentation/SubmitChecklist
--- a/Documentation/arm/Samsung-S3C24XX/CPUfreq.txt
+++ b/Documentation/arm/Samsung-S3C24XX/CPUfreq.txt
--- a/Documentation/arm/Samsung/Overview.txt
+++ b/Documentation/arm/Samsung/Overview.txt
--- a/Documentation/arm/Samsung/clksrc-change-registers.awk
+++ b/Documentation/arm/Samsung/clksrc-change-registers.awk
--- a/Documentation/cdrom/ide-cd
+++ b/Documentation/cdrom/ide-cd
--- a/Documentation/cgroups/cgroup_event_listener.c
+++ b/Documentation/cgroups/cgroup_event_listener.c
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
--- a/Documentation/cgroups/cpusets.txt
+++ b/Documentation/cgroups/cpusets.txt
--- a/Documentation/cgroups/memcg_test.txt
+++ b/Documentation/cgroups/memcg_test.txt
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
--- a/Documentation/circular-buffers.txt
+++ b/Documentation/circular-buffers.txt
--- a/Documentation/console/console.txt
+++ b/Documentation/console/console.txt
--- a/Documentation/cpu-freq/pcc-cpufreq.txt
+++ b/Documentation/cpu-freq/pcc-cpufreq.txt
--- a/Documentation/device-mapper/snapshot.txt
+++ b/Documentation/device-mapper/snapshot.txt
--- a/Documentation/driver-model/platform.txt
+++ b/Documentation/driver-model/platform.txt
--- a/Documentation/eisa.txt
+++ b/Documentation/eisa.txt
--- a/Documentation/email-clients.txt
+++ b/Documentation/email-clients.txt
--- a/Documentation/fault-injection/provoke-crashes.txt
+++ b/Documentation/fault-injection/provoke-crashes.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/Makefile
+++ b/Documentation/filesystems/Makefile
--- a/Documentation/filesystems/ceph.txt
+++ b/Documentation/filesystems/ceph.txt
--- a/Documentation/filesystems/dnotify.txt
+++ b/Documentation/filesystems/dnotify.txt
--- a/Documentation/filesystems/dnotify_test.c
+++ b/Documentation/filesystems/dnotify_test.c
--- a/Documentation/filesystems/logfs.txt
+++ b/Documentation/filesystems/logfs.txt
--- a/Documentation/filesystems/nfs/nfs41-server.txt
+++ b/Documentation/filesystems/nfs/nfs41-server.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/sharedsubtree.txt
+++ b/Documentation/filesystems/sharedsubtree.txt
--- a/Documentation/filesystems/tmpfs.txt
+++ b/Documentation/filesystems/tmpfs.txt
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
--- a/Documentation/hwmon/abituguru
+++ b/Documentation/hwmon/abituguru
--- a/Documentation/hwmon/adt7411
+++ b/Documentation/hwmon/adt7411
--- a/Documentation/hwmon/adt7473
+++ b/Documentation/hwmon/adt7473
--- a/Documentation/hwmon/asc7621
+++ b/Documentation/hwmon/asc7621
--- a/Documentation/hwmon/it87
+++ b/Documentation/hwmon/it87
--- a/Documentation/hwmon/lm90
+++ b/Documentation/hwmon/lm90
--- a/Documentation/init.txt
+++ b/Documentation/init.txt
--- a/Documentation/input/rotary-encoder.txt
+++ b/Documentation/input/rotary-encoder.txt
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/kobject.txt
+++ b/Documentation/kobject.txt
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
--- a/Documentation/kvm/api.txt
+++ b/Documentation/kvm/api.txt
--- a/Documentation/laptops/00-INDEX
+++ b/Documentation/laptops/00-INDEX
--- a/Documentation/laptops/Makefile
+++ b/Documentation/laptops/Makefile
--- a/Documentation/laptops/dslm.c
+++ b/Documentation/laptops/dslm.c
--- a/Documentation/laptops/laptop-mode.txt
+++ b/Documentation/laptops/laptop-mode.txt
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
--- a/Documentation/networking/Makefile
+++ b/Documentation/networking/Makefile
--- a/Documentation/networking/skfp.txt
+++ b/Documentation/networking/skfp.txt
--- a/Documentation/networking/timestamping/Makefile
+++ b/Documentation/networking/timestamping/Makefile
--- a/Documentation/networking/timestamping/timestamping.c
+++ b/Documentation/networking/timestamping/timestamping.c
--- a/Documentation/pnp.txt
+++ b/Documentation/pnp.txt
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
--- a/Documentation/powerpc/dts-bindings/fsl/dma.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/dma.txt
--- a/Documentation/powerpc/dts-bindings/fsl/i2c.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/i2c.txt
--- a/Documentation/s390/kvm.txt
+++ b/Documentation/s390/kvm.txt
--- a/Documentation/scsi/ChangeLog.lpfc
+++ b/Documentation/scsi/ChangeLog.lpfc
--- a/Documentation/serial/tty.txt
+++ b/Documentation/serial/tty.txt
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
--- a/Documentation/timers/00-INDEX
+++ b/Documentation/timers/00-INDEX
--- a/Documentation/timers/Makefile
+++ b/Documentation/timers/Makefile
--- a/Documentation/timers/hpet.txt
+++ b/Documentation/timers/hpet.txt
--- a/Documentation/timers/hpet_example.c
+++ b/Documentation/timers/hpet_example.c
--- a/Documentation/trace/ftrace.txt
+++ b/Documentation/trace/ftrace.txt
--- a/Documentation/vm/00-INDEX
+++ b/Documentation/vm/00-INDEX
--- a/Documentation/vm/Makefile
+++ b/Documentation/vm/Makefile
--- a/Documentation/vm/hugepage-mmap.c
+++ b/Documentation/vm/hugepage-mmap.c
--- a/Documentation/vm/hugepage-shm.c
+++ b/Documentation/vm/hugepage-shm.c
--- a/Documentation/vm/hugetlbpage.txt
+++ b/Documentation/vm/hugetlbpage.txt
--- a/Documentation/vm/map_hugetlb.c
+++ b/Documentation/vm/map_hugetlb.c
--- a/Documentation/vm/slub.txt
+++ b/Documentation/vm/slub.txt
--- a/Documentation/volatile-considered-harmful.txt
+++ b/Documentation/volatile-considered-harmful.txt
--- a/Documentation/voyager.txt
+++ b/Documentation/voyager.txt