Merge branch 'linus' into core/locking

2026-09-26 18:16:26 +00:00 · 2008-11-12 12:39:21 +01:00 · 2008-11-12 12:39:21 +01:00 · 708b8eae0f
commit 708b8eae0f
parent d98d38f201 f21f237cf5
1784 changed files with 88833 additions and 79969 deletions
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/deviceiobook.tmpl
+++ b/Documentation/DocBook/deviceiobook.tmpl
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/DocBook/kernel-hacking.tmpl
+++ b/Documentation/DocBook/kernel-hacking.tmpl
--- a/Documentation/DocBook/mcabook.tmpl
+++ b/Documentation/DocBook/mcabook.tmpl
--- a/Documentation/DocBook/wanbook.tmpl
+++ b/Documentation/DocBook/wanbook.tmpl
--- a/Documentation/DocBook/z8530book.tmpl
+++ b/Documentation/DocBook/z8530book.tmpl
--- a/Documentation/ManagementStyle
+++ b/Documentation/ManagementStyle
--- a/Documentation/accounting/.gitignore
+++ b/Documentation/accounting/.gitignore
--- a/Documentation/arm/empeg/README
+++ b/Documentation/arm/empeg/README
--- a/Documentation/arm/empeg/ir.txt
+++ b/Documentation/arm/empeg/ir.txt
--- a/Documentation/arm/empeg/mkdevs
+++ b/Documentation/arm/empeg/mkdevs
--- a/Documentation/auxdisplay/.gitignore
+++ b/Documentation/auxdisplay/.gitignore
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
--- a/Documentation/connector/.gitignore
+++ b/Documentation/connector/.gitignore
--- a/Documentation/email-clients.txt
+++ b/Documentation/email-clients.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/ftrace.txt
+++ b/Documentation/ftrace.txt
--- a/Documentation/i2c/busses/i2c-sis96x
+++ b/Documentation/i2c/busses/i2c-sis96x
--- a/Documentation/ia64/.gitignore
+++ b/Documentation/ia64/.gitignore
--- a/Documentation/input/elantech.txt
+++ b/Documentation/input/elantech.txt
--- a/Documentation/io-mapping.txt
+++ b/Documentation/io-mapping.txt
--- a/Documentation/isdn/CREDITS
+++ b/Documentation/isdn/CREDITS
--- a/Documentation/ja_JP/HOWTO
+++ b/Documentation/ja_JP/HOWTO
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/lguest/Makefile
+++ b/Documentation/lguest/Makefile
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
--- a/Documentation/networking/.gitignore
+++ b/Documentation/networking/.gitignore
--- a/Documentation/networking/dmfe.txt
+++ b/Documentation/networking/dmfe.txt
--- a/Documentation/pcmcia/.gitignore
+++ b/Documentation/pcmcia/.gitignore
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/Documentation/scheduler/00-INDEX
+++ b/Documentation/scheduler/00-INDEX
--- a/Documentation/scheduler/sched-design-CFS.txt
+++ b/Documentation/scheduler/sched-design-CFS.txt
--- a/Documentation/scsi/aacraid.txt
+++ b/Documentation/scsi/aacraid.txt
--- a/Documentation/sh/new-machine.txt
+++ b/Documentation/sh/new-machine.txt
--- a/Documentation/spi/.gitignore
+++ b/Documentation/spi/.gitignore
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
--- a/Documentation/video4linux/.gitignore
+++ b/Documentation/video4linux/.gitignore
--- a/Documentation/video4linux/README.cx88
+++ b/Documentation/video4linux/README.cx88
--- a/Documentation/video4linux/bttv/CONTRIBUTORS
+++ b/Documentation/video4linux/bttv/CONTRIBUTORS
--- a/Documentation/video4linux/si470x.txt
+++ b/Documentation/video4linux/si470x.txt
--- a/Documentation/vm/.gitignore
+++ b/Documentation/vm/.gitignore
--- a/Documentation/watchdog/src/.gitignore
+++ b/Documentation/watchdog/src/.gitignore
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
--- a/Documentation/x86/x86_64/fake-numa-for-cpusets
+++ b/Documentation/x86/x86_64/fake-numa-for-cpusets