Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-09-18 18:15:59 +00:00 · 2007-05-11 19:03:13 +00:00 · 2007-05-11 19:03:13 +00:00 · 5c34202b8b
commit 5c34202b8b
parent 0d4804b31f 1f8a6b658a
4693 changed files with 275998 additions and 134627 deletions
--- a/62
+++ b/62
--- a/Documentation/ABI/removed/devfs
+++ b/Documentation/ABI/removed/devfs
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/DocBook/librs.tmpl
+++ b/Documentation/DocBook/librs.tmpl
--- a/Documentation/DocBook/man/Makefile
+++ b/Documentation/DocBook/man/Makefile
--- a/Documentation/MSI-HOWTO.txt
+++ b/Documentation/MSI-HOWTO.txt
--- a/Documentation/SubmitChecklist
+++ b/Documentation/SubmitChecklist
--- a/Documentation/SubmittingDrivers
+++ b/Documentation/SubmittingDrivers
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/accounting/getdelays.c
+++ b/Documentation/accounting/getdelays.c
--- a/Documentation/arm/Interrupts
+++ b/Documentation/arm/Interrupts
--- a/Documentation/arm/Samsung-S3C24XX/H1940.txt
+++ b/Documentation/arm/Samsung-S3C24XX/H1940.txt
--- a/Documentation/auxdisplay/cfag12864b
+++ b/Documentation/auxdisplay/cfag12864b
--- a/Documentation/binfmt_misc.txt
+++ b/Documentation/binfmt_misc.txt
--- a/Documentation/blackfin/00-INDEX
+++ b/Documentation/blackfin/00-INDEX
--- a/Documentation/blackfin/Filesystems
+++ b/Documentation/blackfin/Filesystems
--- a/Documentation/blackfin/cache-lock.txt
+++ b/Documentation/blackfin/cache-lock.txt
--- a/Documentation/blackfin/cachefeatures.txt
+++ b/Documentation/blackfin/cachefeatures.txt
--- a/Documentation/block/ioprio.txt
+++ b/Documentation/block/ioprio.txt
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
--- a/Documentation/cpu-freq/cpufreq-stats.txt
+++ b/Documentation/cpu-freq/cpufreq-stats.txt
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
--- a/Documentation/crypto/api-intro.txt
+++ b/Documentation/crypto/api-intro.txt
--- a/Documentation/device-mapper/delay.txt
+++ b/Documentation/device-mapper/delay.txt
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
--- a/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
--- a/Documentation/driver-model/platform.txt
+++ b/Documentation/driver-model/platform.txt
--- a/Documentation/dvb/README.dvb-usb
+++ b/Documentation/dvb/README.dvb-usb
--- a/Documentation/dvb/contributors.txt
+++ b/Documentation/dvb/contributors.txt
--- a/Documentation/fb/arkfb.txt
+++ b/Documentation/fb/arkfb.txt
--- a/Documentation/fb/aty128fb.txt
+++ b/Documentation/fb/aty128fb.txt
--- a/Documentation/fb/deferred_io.txt
+++ b/Documentation/fb/deferred_io.txt
--- a/Documentation/fb/framebuffer.txt
+++ b/Documentation/fb/framebuffer.txt
--- a/Documentation/fb/imacfb.txt
+++ b/Documentation/fb/imacfb.txt
--- a/Documentation/fb/s3fb.txt
+++ b/Documentation/fb/s3fb.txt
--- a/Documentation/fb/sstfb.txt
+++ b/Documentation/fb/sstfb.txt
--- a/Documentation/fb/vt8623fb.txt
+++ b/Documentation/fb/vt8623fb.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/hpfs.txt
+++ b/Documentation/filesystems/hpfs.txt
--- a/Documentation/filesystems/jfs.txt
+++ b/Documentation/filesystems/jfs.txt
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/relay.txt
+++ b/Documentation/filesystems/relay.txt
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/filesystems/xip.txt
+++ b/Documentation/filesystems/xip.txt
--- a/Documentation/fujitsu/frv/gdbstub.txt
+++ b/Documentation/fujitsu/frv/gdbstub.txt
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
--- a/Documentation/hwmon/adm1026
+++ b/Documentation/hwmon/adm1026
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
--- a/Documentation/hwmon/gl518sm
+++ b/Documentation/hwmon/gl518sm
--- a/Documentation/hwmon/lm83
+++ b/Documentation/hwmon/lm83
--- a/Documentation/hwmon/max6650
+++ b/Documentation/hwmon/max6650
--- a/Documentation/hwmon/sis5595
+++ b/Documentation/hwmon/sis5595
--- a/Documentation/hwmon/smsc47m1
+++ b/Documentation/hwmon/smsc47m1
--- a/Documentation/hwmon/smsc47m192
+++ b/Documentation/hwmon/smsc47m192
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
--- a/Documentation/hwmon/via686a
+++ b/Documentation/hwmon/via686a
--- a/Documentation/hwmon/w83792d
+++ b/Documentation/hwmon/w83792d
--- a/Documentation/i2c/busses/i2c-i810
+++ b/Documentation/i2c/busses/i2c-i810
--- a/Documentation/i2c/busses/i2c-nforce2
+++ b/Documentation/i2c/busses/i2c-nforce2
--- a/Documentation/i2c/busses/i2c-sis96x
+++ b/Documentation/i2c/busses/i2c-sis96x
--- a/Documentation/i2c/busses/i2c-via
+++ b/Documentation/i2c/busses/i2c-via
--- a/Documentation/i2c/busses/i2c-viapro
+++ b/Documentation/i2c/busses/i2c-viapro
--- a/Documentation/i2c/i2c-protocol
+++ b/Documentation/i2c/i2c-protocol
--- a/Documentation/i2c/porting-clients
+++ b/Documentation/i2c/porting-clients
--- a/Documentation/i2c/summary
+++ b/Documentation/i2c/summary
--- a/Documentation/i2c/writing-clients
+++ b/Documentation/i2c/writing-clients
--- a/Documentation/i2o/README
+++ b/Documentation/i2o/README
--- a/Documentation/i386/boot.txt
+++ b/Documentation/i386/boot.txt
--- a/Documentation/ia64/aliasing-test.c
+++ b/Documentation/ia64/aliasing-test.c
--- a/Documentation/ia64/aliasing.txt
+++ b/Documentation/ia64/aliasing.txt
--- a/Documentation/ia64/err_inject.txt
+++ b/Documentation/ia64/err_inject.txt
--- a/Documentation/input/atarikbd.txt
+++ b/Documentation/input/atarikbd.txt
--- a/Documentation/input/input-programming.txt
+++ b/Documentation/input/input-programming.txt
--- a/Documentation/input/xpad.txt
+++ b/Documentation/input/xpad.txt
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
--- a/Documentation/isdn/CREDITS
+++ b/Documentation/isdn/CREDITS
--- a/Documentation/isdn/README
+++ b/Documentation/isdn/README
--- a/Documentation/isdn/README.icn
+++ b/Documentation/isdn/README.icn
--- a/Documentation/java.txt
+++ b/Documentation/java.txt
--- a/Documentation/kbuild/modules.txt
+++ b/Documentation/kbuild/modules.txt
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
--- a/Documentation/kref.txt
+++ b/Documentation/kref.txt
--- a/Documentation/laptop-mode.txt
+++ b/Documentation/laptop-mode.txt
--- a/Documentation/m68k/README.buddha
+++ b/Documentation/m68k/README.buddha
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
--- a/Documentation/mips/pci/pci.README
+++ b/Documentation/mips/pci/pci.README
--- a/Documentation/netlabel/introduction.txt
+++ b/Documentation/netlabel/introduction.txt
--- a/Documentation/networking/6pack.txt
+++ b/Documentation/networking/6pack.txt
--- a/Documentation/networking/NAPI_HOWTO.txt
+++ b/Documentation/networking/NAPI_HOWTO.txt
--- a/Documentation/networking/packet_mmap.txt
+++ b/Documentation/networking/packet_mmap.txt
--- a/Documentation/networking/slicecom.hun
+++ b/Documentation/networking/slicecom.hun
--- a/Documentation/networking/slicecom.txt
+++ b/Documentation/networking/slicecom.txt
--- a/Show more
+++ b/Show more