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

2026-09-26 18:16:26 +00:00 · 2008-03-11 19:15:41 +00:00 · 2008-03-11 19:15:41 +00:00 · 5b4d4771e2
commit 5b4d4771e2
parent 55f78e1771 baadac8b10
108 changed files with 3284 additions and 976 deletions
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
--- a/Documentation/pci.txt
+++ b/Documentation/pci.txt
--- a/Documentation/scheduler/sched-stats.txt
+++ b/Documentation/scheduler/sched-stats.txt
--- a/Documentation/usb/usb-help.txt
+++ b/Documentation/usb/usb-help.txt
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
--- a/arch/x86/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
--- a/arch/x86/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
--- a/crypto/chainiv.c
+++ b/crypto/chainiv.c
--- a/crypto/eseqiv.c
+++ b/crypto/eseqiv.c
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
--- a/drivers/ata/pata_rb500_cf.c
+++ b/drivers/ata/pata_rb500_cf.c
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
--- a/drivers/infiniband/core/fmr_pool.c
+++ b/drivers/infiniband/core/fmr_pool.c
--- a/drivers/infiniband/core/iwcm.c
+++ b/drivers/infiniband/core/iwcm.c
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
--- a/drivers/lguest/lguest_user.c
+++ b/drivers/lguest/lguest_user.c
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/memstick/Kconfig
+++ b/drivers/memstick/Kconfig
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
--- a/drivers/memstick/host/Kconfig
+++ b/drivers/memstick/host/Kconfig
--- a/drivers/memstick/host/Makefile
+++ b/drivers/memstick/host/Makefile
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
--- a/drivers/memstick/host/tifm_ms.c
+++ b/drivers/memstick/host/tifm_ms.c
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
--- a/drivers/usb/serial/cypress_m8.h
+++ b/drivers/usb/serial/cypress_m8.h
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
--- a/drivers/watchdog/cpu5wdt.c
+++ b/drivers/watchdog/cpu5wdt.c
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
--- a/drivers/watchdog/it8712f_wdt.c
+++ b/drivers/watchdog/it8712f_wdt.c
--- a/drivers/watchdog/machzwd.c
+++ b/drivers/watchdog/machzwd.c
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
--- a/fs/ocfs2/dlm/dlmconvert.c
+++ b/fs/ocfs2/dlm/dlmconvert.c
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
--- a/fs/ocfs2/dlm/dlmthread.c
+++ b/fs/ocfs2/dlm/dlmthread.c
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
--- a/fs/ocfs2/resize.c
+++ b/fs/ocfs2/resize.c
--- a/include/asm-x86/pgtable_32.h
+++ b/include/asm-x86/pgtable_32.h
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
--- a/include/linux/memstick.h
+++ b/include/linux/memstick.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/tifm.h
+++ b/include/linux/tifm.h
--- a/include/linux/time.h
+++ b/include/linux/time.h
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
--- a/include/linux/usb/Kbuild
+++ b/include/linux/usb/Kbuild
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
--- a/init/Kconfig
+++ b/init/Kconfig
--- a/ipc/shm.c
+++ b/ipc/shm.c
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
--- a/kernel/exit.c
+++ b/kernel/exit.c
--- a/kernel/module.c
+++ b/kernel/module.c
--- a/Show more
+++ b/Show more