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

2026-09-24 18:16:04 +00:00 · 2007-04-26 09:31:28 +01:00 · 2007-04-26 09:31:28 +01:00 · ef2e58ea6b
commit ef2e58ea6b
parent 06d63cc51d de46c33745
879 changed files with 9670 additions and 10202 deletions
--- a/include/acpi/acinterp.h
+++ b/include/acpi/acinterp.h
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
--- a/include/asm-alpha/compiler.h
+++ b/include/asm-alpha/compiler.h
--- a/include/asm-alpha/core_mcpcia.h
+++ b/include/asm-alpha/core_mcpcia.h
--- a/include/asm-alpha/io.h
+++ b/include/asm-alpha/io.h
--- a/include/asm-arm/arch-at91/gpio.h
+++ b/include/asm-arm/arch-at91/gpio.h
--- a/include/asm-arm/arch-ixp4xx/io.h
+++ b/include/asm-arm/arch-ixp4xx/io.h
--- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+++ b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
--- a/include/asm-arm/arch-lh7a40x/entry-macro.S
+++ b/include/asm-arm/arch-lh7a40x/entry-macro.S
--- a/include/asm-arm/arch-ns9xxx/clock.h
+++ b/include/asm-arm/arch-ns9xxx/clock.h
--- a/include/asm-arm/arch-omap/gpio.h
+++ b/include/asm-arm/arch-omap/gpio.h
--- a/include/asm-arm/arch-pxa/gpio.h
+++ b/include/asm-arm/arch-pxa/gpio.h
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
--- a/include/asm-arm/arch-s3c2410/gpio.h
+++ b/include/asm-arm/arch-s3c2410/gpio.h
--- a/include/asm-arm/arch-sa1100/gpio.h
+++ b/include/asm-arm/arch-sa1100/gpio.h
--- a/include/asm-arm/atomic.h
+++ b/include/asm-arm/atomic.h
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
--- a/include/asm-avr32/arch-at32ap/gpio.h
+++ b/include/asm-avr32/arch-at32ap/gpio.h
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
--- a/include/asm-i386/apic.h
+++ b/include/asm-i386/apic.h
--- a/include/asm-i386/cpufeature.h
+++ b/include/asm-i386/cpufeature.h
--- a/include/asm-i386/elf.h
+++ b/include/asm-i386/elf.h
--- a/include/asm-i386/msr.h
+++ b/include/asm-i386/msr.h
--- a/include/asm-i386/nmi.h
+++ b/include/asm-i386/nmi.h
--- a/include/asm-i386/paravirt.h
+++ b/include/asm-i386/paravirt.h
--- a/include/asm-i386/sync_bitops.h
+++ b/include/asm-i386/sync_bitops.h
--- a/include/asm-i386/termbits.h
+++ b/include/asm-i386/termbits.h
--- a/include/asm-i386/vmi_time.h
+++ b/include/asm-i386/vmi_time.h
--- a/include/asm-ia64/machvec.h
+++ b/include/asm-ia64/machvec.h
--- a/include/asm-ia64/meminit.h
+++ b/include/asm-ia64/meminit.h
--- a/include/asm-ia64/processor.h
+++ b/include/asm-ia64/processor.h
--- a/include/asm-ia64/sn/pcibr_provider.h
+++ b/include/asm-ia64/sn/pcibr_provider.h
--- a/include/asm-m32r/dma-mapping.h
+++ b/include/asm-m32r/dma-mapping.h
--- a/include/asm-m68k/dma-mapping.h
+++ b/include/asm-m68k/dma-mapping.h
--- a/include/asm-m68k/mc146818rtc.h
+++ b/include/asm-m68k/mc146818rtc.h
--- a/include/asm-mips/atomic.h
+++ b/include/asm-mips/atomic.h
--- a/include/asm-mips/bitops.h
+++ b/include/asm-mips/bitops.h
--- a/include/asm-mips/bug.h
+++ b/include/asm-mips/bug.h
--- a/include/asm-mips/cacheflush.h
+++ b/include/asm-mips/cacheflush.h
--- a/include/asm-mips/checksum.h
+++ b/include/asm-mips/checksum.h
--- a/include/asm-mips/cpu-features.h
+++ b/include/asm-mips/cpu-features.h
--- a/include/asm-mips/cpu-info.h
+++ b/include/asm-mips/cpu-info.h
--- a/include/asm-mips/delay.h
+++ b/include/asm-mips/delay.h
--- a/include/asm-mips/fpu.h
+++ b/include/asm-mips/fpu.h
--- a/include/asm-mips/hazards.h
+++ b/include/asm-mips/hazards.h
--- a/include/asm-mips/irqflags.h
+++ b/include/asm-mips/irqflags.h
--- a/include/asm-mips/mach-au1x00/au1xxx_ide.h
+++ b/include/asm-mips/mach-au1x00/au1xxx_ide.h
--- a/include/asm-mips/mach-ip27/dma-coherence.h
+++ b/include/asm-mips/mach-ip27/dma-coherence.h
--- a/include/asm-mips/mach-ip32/dma-coherence.h
+++ b/include/asm-mips/mach-ip32/dma-coherence.h
--- a/include/asm-mips/marvell.h
+++ b/include/asm-mips/marvell.h
--- a/include/asm-mips/pgtable-64.h
+++ b/include/asm-mips/pgtable-64.h
--- a/include/asm-mips/pgtable.h
+++ b/include/asm-mips/pgtable.h
--- a/include/asm-mips/rtlx.h
+++ b/include/asm-mips/rtlx.h
--- a/include/asm-mips/sgiarcs.h
+++ b/include/asm-mips/sgiarcs.h
--- a/include/asm-mips/sibyte/sb1250.h
+++ b/include/asm-mips/sibyte/sb1250.h
--- a/include/asm-mips/sibyte/sb1250_scd.h
+++ b/include/asm-mips/sibyte/sb1250_scd.h
--- a/include/asm-mips/smtc_ipi.h
+++ b/include/asm-mips/smtc_ipi.h
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
--- a/include/asm-powerpc/floppy.h
+++ b/include/asm-powerpc/floppy.h
--- a/include/asm-powerpc/hvcall.h
+++ b/include/asm-powerpc/hvcall.h
--- a/include/asm-powerpc/immap_qe.h
+++ b/include/asm-powerpc/immap_qe.h
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
--- a/include/asm-powerpc/spu_csa.h
+++ b/include/asm-powerpc/spu_csa.h
--- a/include/asm-powerpc/systbl.h
+++ b/include/asm-powerpc/systbl.h
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
--- a/include/asm-s390/checksum.h
+++ b/include/asm-s390/checksum.h
--- a/include/asm-s390/ipl.h
+++ b/include/asm-s390/ipl.h
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
--- a/include/asm-sh/hp6xx.h
+++ b/include/asm-sh/hp6xx.h
--- a/include/asm-sh/ioctls.h
+++ b/include/asm-sh/ioctls.h
--- a/include/asm-sh/irq.h
+++ b/include/asm-sh/irq.h
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
--- a/include/asm-sh/unistd.h
+++ b/include/asm-sh/unistd.h
--- a/include/asm-sparc/a.out.h
+++ b/include/asm-sparc/a.out.h
--- a/include/asm-sparc/dma-mapping.h
+++ b/include/asm-sparc/dma-mapping.h
--- a/include/asm-sparc/mostek.h
+++ b/include/asm-sparc/mostek.h
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
--- a/include/asm-sparc64/a.out.h
+++ b/include/asm-sparc64/a.out.h
--- a/include/asm-sparc64/mostek.h
+++ b/include/asm-sparc64/mostek.h
--- a/include/asm-sparc64/tsb.h
+++ b/include/asm-sparc64/tsb.h
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
--- a/include/asm-um/common.lds.S
+++ b/include/asm-um/common.lds.S
--- a/include/asm-um/delay.h
+++ b/include/asm-um/delay.h
--- a/include/asm-um/pgtable-2level.h
+++ b/include/asm-um/pgtable-2level.h
--- a/include/asm-x86_64/apic.h
+++ b/include/asm-x86_64/apic.h
--- a/include/asm-x86_64/hw_irq.h
+++ b/include/asm-x86_64/hw_irq.h
--- a/include/asm-x86_64/nmi.h
+++ b/include/asm-x86_64/nmi.h
--- a/include/asm-x86_64/proto.h
+++ b/include/asm-x86_64/proto.h
--- a/include/asm-x86_64/smp.h
+++ b/include/asm-x86_64/smp.h
--- a/include/asm-x86_64/uaccess.h
+++ b/include/asm-x86_64/uaccess.h
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/Show more
+++ b/Show more