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

2026-09-18 18:15:59 +00:00 · 2007-08-02 22:36:28 +01:00 · 2007-08-02 22:36:28 +01:00 · f2d40cd92c
commit f2d40cd92c
parent 3ca135e16a 7a883eaf62
56 changed files with 516 additions and 384 deletions
--- a/Documentation/Changes
+++ b/Documentation/Changes
--- a/2
+++ b/2
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
--- a/arch/i386/boot/edd.c
+++ b/arch/i386/boot/edd.c
--- a/arch/i386/boot/video-vesa.c
+++ b/arch/i386/boot/video-vesa.c
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
--- a/arch/ia64/sn/kernel/sn2/timer.c
+++ b/arch/ia64/sn/kernel/sn2/timer.c
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
--- a/include/asm-avr32/bug.h
+++ b/include/asm-avr32/bug.h
--- a/include/asm-frv/mb86943a.h
+++ b/include/asm-frv/mb86943a.h
--- a/include/asm-parisc/bug.h
+++ b/include/asm-parisc/bug.h
--- a/include/asm-s390/bug.h
+++ b/include/asm-s390/bug.h
--- a/include/asm-sh/bug.h
+++ b/include/asm-sh/bug.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
--- a/kernel/sched_stats.h
+++ b/kernel/sched_stats.h
--- a/net/netlabel/netlabel_user.c
+++ b/net/netlabel/netlabel_user.c
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
--- a/security/selinux/netlabel.c
+++ b/security/selinux/netlabel.c