Merge branch 'merge' into powerpc-next

2026-09-24 18:16:04 +00:00 · 2008-05-23 16:53:23 +10:00 · 2008-05-23 16:53:23 +10:00 · acf464817d
commit acf464817d
parent 80d267f9ae 8962cadbe7
694 changed files with 9156 additions and 5993 deletions
--- 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/mmc.h
+++ b/include/asm-arm/arch-omap/mmc.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-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/blackfin.h
+++ b/include/asm-blackfin/mach-bf527/blackfin.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-ia64/kvm.h
+++ b/include/asm-ia64/kvm.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-powerpc/mpic.h
+++ b/include/asm-powerpc/mpic.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/include/asm-sparc/psr.h
+++ b/include/asm-sparc/psr.h
--- a/include/asm-sparc/ptrace.h
+++ b/include/asm-sparc/ptrace.h
--- a/include/asm-sparc/resource.h
+++ b/include/asm-sparc/resource.h
--- a/include/asm-sparc/ross.h
+++ b/include/asm-sparc/ross.h
--- a/include/asm-sparc/rtc.h
+++ b/include/asm-sparc/rtc.h
--- a/include/asm-sparc/sbi.h
+++ b/include/asm-sparc/sbi.h
--- a/include/asm-sparc/sbus.h
+++ b/include/asm-sparc/sbus.h
--- a/include/asm-sparc/scatterlist.h
+++ b/include/asm-sparc/scatterlist.h
--- a/include/asm-sparc/shmparam.h
+++ b/include/asm-sparc/shmparam.h
--- a/include/asm-sparc/sigcontext.h
+++ b/include/asm-sparc/sigcontext.h
--- a/include/asm-sparc/siginfo.h
+++ b/include/asm-sparc/siginfo.h
--- a/include/asm-sparc/signal.h
+++ b/include/asm-sparc/signal.h
--- a/include/asm-sparc/smpprim.h
+++ b/include/asm-sparc/smpprim.h
--- a/include/asm-sparc/socket.h
+++ b/include/asm-sparc/socket.h
--- a/include/asm-sparc/stat.h
+++ b/include/asm-sparc/stat.h
--- a/include/asm-sparc/statfs.h
+++ b/include/asm-sparc/statfs.h
--- a/include/asm-sparc/string.h
+++ b/include/asm-sparc/string.h
--- a/include/asm-sparc/sun4paddr.h
+++ b/include/asm-sparc/sun4paddr.h
--- a/include/asm-sparc/sunbpp.h
+++ b/include/asm-sparc/sunbpp.h
--- a/include/asm-sparc/sysen.h
+++ b/include/asm-sparc/sysen.h
--- a/include/asm-sparc/termios.h
+++ b/include/asm-sparc/termios.h
--- a/include/asm-sparc/timer.h
+++ b/include/asm-sparc/timer.h
--- a/include/asm-sparc/traps.h
+++ b/include/asm-sparc/traps.h
--- a/include/asm-sparc/tsunami.h
+++ b/include/asm-sparc/tsunami.h
--- a/include/asm-sparc/turbosparc.h
+++ b/include/asm-sparc/turbosparc.h
--- a/include/asm-sparc/types.h
+++ b/include/asm-sparc/types.h
--- a/include/asm-sparc/uaccess.h
+++ b/include/asm-sparc/uaccess.h
--- a/include/asm-sparc/vac-ops.h
+++ b/include/asm-sparc/vac-ops.h
--- a/include/asm-sparc/vaddrs.h
+++ b/include/asm-sparc/vaddrs.h
--- a/include/asm-sparc/viking.h
+++ b/include/asm-sparc/viking.h
--- a/include/asm-sparc/winmacro.h
+++ b/include/asm-sparc/winmacro.h
--- a/include/asm-sparc64/apb.h
+++ b/include/asm-sparc64/apb.h
--- a/include/asm-sparc64/asi.h
+++ b/include/asm-sparc64/asi.h
--- a/include/asm-sparc64/auxio.h
+++ b/include/asm-sparc64/auxio.h
--- a/include/asm-sparc64/bbc.h
+++ b/include/asm-sparc64/bbc.h
--- a/include/asm-sparc64/bitops.h
+++ b/include/asm-sparc64/bitops.h
--- a/include/asm-sparc64/chafsr.h
+++ b/include/asm-sparc64/chafsr.h
--- a/include/asm-sparc64/checksum.h
+++ b/include/asm-sparc64/checksum.h
--- a/include/asm-sparc64/chmctrl.h
+++ b/include/asm-sparc64/chmctrl.h
--- a/include/asm-sparc64/dcr.h
+++ b/include/asm-sparc64/dcr.h
--- a/include/asm-sparc64/display7seg.h
+++ b/include/asm-sparc64/display7seg.h
--- a/Show more
+++ b/Show more