Merge branch 'linus' into x86/gart

2026-09-26 18:16:26 +00:00 · 2008-06-12 11:27:22 +02:00 · 2008-06-12 11:27:22 +02:00 · bb6dfb32f9
commit bb6dfb32f9
parent 4f384f8bcd 5e70b7f3c2
1333 changed files with 19968 additions and 11257 deletions
--- a/include/asm-arm/arch-at91/io.h
+++ b/include/asm-arm/arch-at91/io.h
--- a/include/asm-arm/arch-omap/board-palmte.h
+++ b/include/asm-arm/arch-omap/board-palmte.h
--- a/include/asm-arm/arch-omap/clock.h
+++ b/include/asm-arm/arch-omap/clock.h
--- a/include/asm-arm/arch-omap/common.h
+++ b/include/asm-arm/arch-omap/common.h
--- a/include/asm-arm/arch-omap/control.h
+++ b/include/asm-arm/arch-omap/control.h
--- a/include/asm-arm/arch-omap/entry-macro.S
+++ b/include/asm-arm/arch-omap/entry-macro.S
--- a/include/asm-arm/arch-omap/gpio.h
+++ b/include/asm-arm/arch-omap/gpio.h
--- a/include/asm-arm/arch-omap/hardware.h
+++ b/include/asm-arm/arch-omap/hardware.h
--- a/include/asm-arm/arch-omap/mmc.h
+++ b/include/asm-arm/arch-omap/mmc.h
--- a/include/asm-arm/arch-pxa/mfp-pxa27x.h
+++ b/include/asm-arm/arch-pxa/mfp-pxa27x.h
--- a/include/asm-arm/arch-pxa/pxa2xx-gpio.h
+++ b/include/asm-arm/arch-pxa/pxa2xx-gpio.h
--- a/include/asm-arm/arch-sa1100/collie.h
+++ b/include/asm-arm/arch-sa1100/collie.h
--- a/include/asm-arm/arch-sa1100/irqs.h
+++ b/include/asm-arm/arch-sa1100/irqs.h
--- a/include/asm-arm/hardware/locomo.h
+++ b/include/asm-arm/hardware/locomo.h
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
--- a/include/asm-arm/pgtable-nommu.h
+++ b/include/asm-arm/pgtable-nommu.h
--- a/include/asm-arm/spinlock.h
+++ b/include/asm-arm/spinlock.h
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
--- a/include/asm-blackfin/bfin-global.h
+++ b/include/asm-blackfin/bfin-global.h
--- a/include/asm-blackfin/checksum.h
+++ b/include/asm-blackfin/checksum.h
--- a/include/asm-blackfin/gpio.h
+++ b/include/asm-blackfin/gpio.h
--- a/include/asm-blackfin/io.h
+++ b/include/asm-blackfin/io.h
--- a/include/asm-blackfin/mach-bf527/anomaly.h
+++ b/include/asm-blackfin/mach-bf527/anomaly.h
--- a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf527/blackfin.h
+++ b/include/asm-blackfin/mach-bf527/blackfin.h
--- a/include/asm-blackfin/mach-bf533/anomaly.h
+++ b/include/asm-blackfin/mach-bf533/anomaly.h
--- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf537/anomaly.h
+++ b/include/asm-blackfin/mach-bf537/anomaly.h
--- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf548/anomaly.h
+++ b/include/asm-blackfin/mach-bf548/anomaly.h
--- a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf561/anomaly.h
+++ b/include/asm-blackfin/mach-bf561/anomaly.h
--- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf561/dma.h
+++ b/include/asm-blackfin/mach-bf561/dma.h
--- a/include/asm-blackfin/serial.h
+++ b/include/asm-blackfin/serial.h
--- a/include/asm-frv/checksum.h
+++ b/include/asm-frv/checksum.h
--- a/include/asm-frv/mem-layout.h
+++ b/include/asm-frv/mem-layout.h
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
--- a/include/asm-h8300/cacheflush.h
+++ b/include/asm-h8300/cacheflush.h
--- a/include/asm-ia64/kvm.h
+++ b/include/asm-ia64/kvm.h
--- a/include/asm-ia64/patch.h
+++ b/include/asm-ia64/patch.h
--- a/include/asm-ia64/ptrace.h
+++ b/include/asm-ia64/ptrace.h
--- a/include/asm-ia64/sections.h
+++ b/include/asm-ia64/sections.h
--- a/include/asm-m32r/uaccess.h
+++ b/include/asm-m32r/uaccess.h
--- a/include/asm-m68k/bug.h
+++ b/include/asm-m68k/bug.h
--- a/include/asm-m68k/io.h
+++ b/include/asm-m68k/io.h
--- a/include/asm-m68k/setup.h
+++ b/include/asm-m68k/setup.h
--- a/include/asm-m68k/uaccess.h
+++ b/include/asm-m68k/uaccess.h
--- a/include/asm-mips/gic.h
+++ b/include/asm-mips/gic.h
--- a/include/asm-mips/mach-au1x00/au1000.h
+++ b/include/asm-mips/mach-au1x00/au1000.h
--- a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h
+++ b/include/asm-mips/mach-au1x00/au1xxx_dbdma.h
--- a/include/asm-mips/mipsregs.h
+++ b/include/asm-mips/mipsregs.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-mn10300/ipcbuf.h
+++ b/include/asm-mn10300/ipcbuf.h
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
--- a/include/asm-powerpc/mpic.h
+++ b/include/asm-powerpc/mpic.h
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
--- a/include/asm-sh/checksum_32.h
+++ b/include/asm-sh/checksum_32.h
--- a/include/asm-sh/kgdb.h
+++ b/include/asm-sh/kgdb.h
--- a/include/asm-sparc/asi.h
+++ b/include/asm-sparc/asi.h
--- a/include/asm-sparc/auxio.h
+++ b/include/asm-sparc/auxio.h
--- a/include/asm-sparc/bitops.h
+++ b/include/asm-sparc/bitops.h
--- a/include/asm-sparc/btfixup.h
+++ b/include/asm-sparc/btfixup.h
--- a/include/asm-sparc/checksum.h
+++ b/include/asm-sparc/checksum.h
--- a/include/asm-sparc/clock.h
+++ b/include/asm-sparc/clock.h
--- a/include/asm-sparc/contregs.h
+++ b/include/asm-sparc/contregs.h
--- a/include/asm-sparc/cypress.h
+++ b/include/asm-sparc/cypress.h
--- a/include/asm-sparc/delay.h
+++ b/include/asm-sparc/delay.h
--- a/include/asm-sparc/ebus.h
+++ b/include/asm-sparc/ebus.h
--- a/include/asm-sparc/ecc.h
+++ b/include/asm-sparc/ecc.h
--- a/include/asm-sparc/eeprom.h
+++ b/include/asm-sparc/eeprom.h
--- a/include/asm-sparc/elf.h
+++ b/include/asm-sparc/elf.h
--- a/include/asm-sparc/fcntl.h
+++ b/include/asm-sparc/fcntl.h
--- a/include/asm-sparc/head.h
+++ b/include/asm-sparc/head.h
--- a/include/asm-sparc/idprom.h
+++ b/include/asm-sparc/idprom.h
--- a/include/asm-sparc/io.h
+++ b/include/asm-sparc/io.h
--- a/include/asm-sparc/ioctl.h
+++ b/include/asm-sparc/ioctl.h
--- a/include/asm-sparc/kdebug.h
+++ b/include/asm-sparc/kdebug.h
--- a/include/asm-sparc/machines.h
+++ b/include/asm-sparc/machines.h
--- a/include/asm-sparc/mbus.h
+++ b/include/asm-sparc/mbus.h
--- a/include/asm-sparc/memreg.h
+++ b/include/asm-sparc/memreg.h
--- a/include/asm-sparc/mman.h
+++ b/include/asm-sparc/mman.h
--- a/include/asm-sparc/mostek.h
+++ b/include/asm-sparc/mostek.h
--- a/include/asm-sparc/mpmbox.h
+++ b/include/asm-sparc/mpmbox.h
--- a/include/asm-sparc/msi.h
+++ b/include/asm-sparc/msi.h
--- a/include/asm-sparc/mxcc.h
+++ b/include/asm-sparc/mxcc.h
--- a/include/asm-sparc/namei.h
+++ b/include/asm-sparc/namei.h
--- a/include/asm-sparc/obio.h
+++ b/include/asm-sparc/obio.h
--- a/include/asm-sparc/openprom.h
+++ b/include/asm-sparc/openprom.h
--- a/include/asm-sparc/oplib.h
+++ b/include/asm-sparc/oplib.h
--- a/include/asm-sparc/page.h
+++ b/include/asm-sparc/page.h
--- a/include/asm-sparc/param.h
+++ b/include/asm-sparc/param.h
--- a/include/asm-sparc/pbm.h
+++ b/include/asm-sparc/pbm.h
--- a/include/asm-sparc/pcic.h
+++ b/include/asm-sparc/pcic.h
--- a/include/asm-sparc/pgalloc.h
+++ b/include/asm-sparc/pgalloc.h
--- a/include/asm-sparc/pgtable.h
+++ b/include/asm-sparc/pgtable.h
--- a/include/asm-sparc/pgtsrmmu.h
+++ b/include/asm-sparc/pgtsrmmu.h
--- a/include/asm-sparc/pgtsun4.h
+++ b/include/asm-sparc/pgtsun4.h
--- a/include/asm-sparc/pgtsun4c.h
+++ b/include/asm-sparc/pgtsun4c.h
--- a/Show more
+++ b/Show more