Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-11-10 20:48:12 +00:00 · 2009-01-08 13:22:55 +11:00 · 2009-01-08 13:22:55 +11:00 · 6206aa8b2b
commit 6206aa8b2b
parent 95f8e302c0 9e42d0cf50
5550 changed files with 839908 additions and 204555 deletions
--- a/.mailmap
+++ b/.mailmap
--- a/27
+++ b/27
--- a/Documentation/ABI/testing/sysfs-class-uwb_rc
+++ b/Documentation/ABI/testing/sysfs-class-uwb_rc
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
--- a/Documentation/DMA-mapping.txt
+++ b/Documentation/DMA-mapping.txt
--- a/Documentation/DocBook/networking.tmpl
+++ b/Documentation/DocBook/networking.tmpl
--- 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/00-INDEX
+++ b/Documentation/RCU/00-INDEX
--- a/Documentation/RCU/trace.txt
+++ b/Documentation/RCU/trace.txt
--- a/Documentation/arm/pxa/mfp.txt
+++ b/Documentation/arm/pxa/mfp.txt
--- a/Documentation/blackfin/00-INDEX
+++ b/Documentation/blackfin/00-INDEX
--- 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/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
--- a/Documentation/cputopology.txt
+++ b/Documentation/cputopology.txt
--- a/Documentation/dell_rbu.txt
+++ b/Documentation/dell_rbu.txt
--- a/Documentation/dvb/technisat.txt
+++ b/Documentation/dvb/technisat.txt
--- a/Documentation/fb/pxafb.txt
+++ b/Documentation/fb/pxafb.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/devpts.txt
+++ b/Documentation/filesystems/devpts.txt
--- a/Documentation/filesystems/files.txt
+++ b/Documentation/filesystems/files.txt
--- a/Documentation/filesystems/ocfs2.txt
+++ b/Documentation/filesystems/ocfs2.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/ubifs.txt
+++ b/Documentation/filesystems/ubifs.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/hwmon/abituguru-datasheet
+++ b/Documentation/hwmon/abituguru-datasheet
--- a/Documentation/hwmon/adt7470
+++ b/Documentation/hwmon/adt7470
--- a/Documentation/hwmon/f71882fg
+++ b/Documentation/hwmon/f71882fg
--- a/Documentation/hwmon/it87
+++ b/Documentation/hwmon/it87
--- a/Documentation/hwmon/lm70
+++ b/Documentation/hwmon/lm70
--- a/Documentation/hwmon/lm85
+++ b/Documentation/hwmon/lm85
--- a/Documentation/hwmon/ltc4245
+++ b/Documentation/hwmon/ltc4245
--- a/Documentation/ide/warm-plug-howto.txt
+++ b/Documentation/ide/warm-plug-howto.txt
--- a/Documentation/input/walkera0701.txt
+++ b/Documentation/input/walkera0701.txt
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
--- a/Documentation/kbuild/00-INDEX
+++ b/Documentation/kbuild/00-INDEX
--- a/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
--- a/Documentation/kbuild/kconfig.txt
+++ b/Documentation/kbuild/kconfig.txt
--- a/Documentation/kbuild/modules.txt
+++ b/Documentation/kbuild/modules.txt
--- a/Documentation/kernel-doc-nano-HOWTO.txt
+++ b/Documentation/kernel-doc-nano-HOWTO.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/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
--- a/Documentation/lockstat.txt
+++ b/Documentation/lockstat.txt
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
--- a/Documentation/memory-hotplug.txt
+++ b/Documentation/memory-hotplug.txt
--- a/Documentation/mips/AU1xxx_IDE.README
+++ b/Documentation/mips/AU1xxx_IDE.README
--- a/Documentation/networking/rxrpc.txt
+++ b/Documentation/networking/rxrpc.txt
--- a/Documentation/networking/tuntap.txt
+++ b/Documentation/networking/tuntap.txt
--- a/Documentation/powerpc/cpu_features.txt
+++ b/Documentation/powerpc/cpu_features.txt
--- a/Documentation/s390/Debugging390.txt
+++ b/Documentation/s390/Debugging390.txt
--- a/Documentation/s390/cds.txt
+++ b/Documentation/s390/cds.txt
--- a/Documentation/s390/s390dbf.txt
+++ b/Documentation/s390/s390dbf.txt
--- a/Documentation/scsi/ChangeLog.lpfc
+++ b/Documentation/scsi/ChangeLog.lpfc
--- a/Documentation/scsi/ChangeLog.ncr53c8xx
+++ b/Documentation/scsi/ChangeLog.ncr53c8xx
--- a/Documentation/scsi/ChangeLog.sym53c8xx
+++ b/Documentation/scsi/ChangeLog.sym53c8xx
--- a/Documentation/scsi/cxgb3i.txt
+++ b/Documentation/scsi/cxgb3i.txt
--- a/Documentation/spi/spi-lm70llp
+++ b/Documentation/spi/spi-lm70llp
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
--- a/Documentation/usb/power-management.txt
+++ b/Documentation/usb/power-management.txt
--- a/Documentation/usb/wusb-cbaf
+++ b/Documentation/usb/wusb-cbaf
--- a/Documentation/video4linux/API.html
+++ b/Documentation/video4linux/API.html
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
--- a/Documentation/video4linux/README.cx88
+++ b/Documentation/video4linux/README.cx88
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
--- a/Documentation/video4linux/si470x.txt
+++ b/Documentation/video4linux/si470x.txt
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
--- a/Documentation/vm/unevictable-lru.txt
+++ b/Documentation/vm/unevictable-lru.txt
--- a/Documentation/wimax/README.i2400m
+++ b/Documentation/wimax/README.i2400m
--- a/Documentation/wimax/README.wimax
+++ b/Documentation/wimax/README.wimax
--- a/Documentation/x86/zero-page.txt
+++ b/Documentation/x86/zero-page.txt
--- a/135
+++ b/135
--- a/15
+++ b/15
--- a/32
+++ b/32
--- a/arch/Kconfig
+++ b/arch/Kconfig
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
--- a/arch/alpha/include/asm/atomic.h
+++ b/arch/alpha/include/asm/atomic.h
--- a/arch/alpha/include/asm/byteorder.h
+++ b/arch/alpha/include/asm/byteorder.h
--- a/arch/alpha/include/asm/io.h
+++ b/arch/alpha/include/asm/io.h
--- a/arch/alpha/include/asm/smp.h
+++ b/arch/alpha/include/asm/smp.h
--- a/arch/alpha/include/asm/swab.h
+++ b/arch/alpha/include/asm/swab.h
--- a/arch/alpha/include/asm/topology.h
+++ b/arch/alpha/include/asm/topology.h
--- a/arch/alpha/kernel/Makefile
+++ b/arch/alpha/kernel/Makefile
--- a/arch/alpha/kernel/binfmt_loader.c
+++ b/arch/alpha/kernel/binfmt_loader.c
--- a/arch/alpha/kernel/init_task.c
+++ b/arch/alpha/kernel/init_task.c
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
--- a/arch/alpha/kernel/pci_impl.h
+++ b/arch/alpha/kernel/pci_impl.h
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
--- a/Show more
+++ b/Show more