Merge branch 'linux-2.6'

2026-09-24 18:16:04 +00:00 · 2007-05-08 13:37:51 +10:00 · 2007-05-08 13:37:51 +10:00 · 02bbc0f09c
commit 02bbc0f09c
parent 7487a2245b 5b94f675f5
2299 changed files with 160249 additions and 60613 deletions
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/asm-alpha/mmu_context.h
+++ b/include/asm-alpha/mmu_context.h
--- a/include/asm-alpha/percpu.h
+++ b/include/asm-alpha/percpu.h
--- a/include/asm-alpha/scatterlist.h
+++ b/include/asm-alpha/scatterlist.h
--- a/include/asm-alpha/thread_info.h
+++ b/include/asm-alpha/thread_info.h
--- a/include/asm-arm/arch-at91/at91_adc.h
+++ b/include/asm-arm/arch-at91/at91_adc.h
--- a/include/asm-arm/arch-at91/board.h
+++ b/include/asm-arm/arch-at91/board.h
--- a/include/asm-arm/arch-ebsa110/io.h
+++ b/include/asm-arm/arch-ebsa110/io.h
--- a/include/asm-arm/arch-imx/imx-regs.h
+++ b/include/asm-arm/arch-imx/imx-regs.h
--- a/include/asm-arm/arch-imx/mmc.h
+++ b/include/asm-arm/arch-imx/mmc.h
--- a/include/asm-arm/arch-iop13xx/io.h
+++ b/include/asm-arm/arch-iop13xx/io.h
--- a/include/asm-arm/arch-iop13xx/iop13xx.h
+++ b/include/asm-arm/arch-iop13xx/iop13xx.h
--- a/include/asm-arm/arch-iop13xx/time.h
+++ b/include/asm-arm/arch-iop13xx/time.h
--- a/include/asm-arm/arch-iop32x/io.h
+++ b/include/asm-arm/arch-iop32x/io.h
--- a/include/asm-arm/arch-iop32x/iop32x.h
+++ b/include/asm-arm/arch-iop32x/iop32x.h
--- a/include/asm-arm/arch-iop32x/memory.h
+++ b/include/asm-arm/arch-iop32x/memory.h
--- a/include/asm-arm/arch-iop33x/io.h
+++ b/include/asm-arm/arch-iop33x/io.h
--- a/include/asm-arm/arch-iop33x/iop33x.h
+++ b/include/asm-arm/arch-iop33x/iop33x.h
--- a/include/asm-arm/arch-iop33x/memory.h
+++ b/include/asm-arm/arch-iop33x/memory.h
--- a/include/asm-arm/arch-ixp23xx/io.h
+++ b/include/asm-arm/arch-ixp23xx/io.h
--- a/include/asm-arm/arch-ixp4xx/cpu.h
+++ b/include/asm-arm/arch-ixp4xx/cpu.h
--- a/include/asm-arm/arch-ixp4xx/dma.h
+++ b/include/asm-arm/arch-ixp4xx/dma.h
--- a/include/asm-arm/arch-ixp4xx/dsmg600.h
+++ b/include/asm-arm/arch-ixp4xx/dsmg600.h
--- a/include/asm-arm/arch-ixp4xx/entry-macro.S
+++ b/include/asm-arm/arch-ixp4xx/entry-macro.S
--- a/include/asm-arm/arch-ixp4xx/gpio.h
+++ b/include/asm-arm/arch-ixp4xx/gpio.h
--- a/include/asm-arm/arch-ixp4xx/hardware.h
+++ b/include/asm-arm/arch-ixp4xx/hardware.h
--- a/include/asm-arm/arch-ixp4xx/io.h
+++ b/include/asm-arm/arch-ixp4xx/io.h
--- a/include/asm-arm/arch-ixp4xx/irqs.h
+++ b/include/asm-arm/arch-ixp4xx/irqs.h
--- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+++ b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
--- a/include/asm-arm/arch-netx/netx-regs.h
+++ b/include/asm-arm/arch-netx/netx-regs.h
--- a/include/asm-arm/arch-ns9xxx/board.h
+++ b/include/asm-arm/arch-ns9xxx/board.h
--- a/include/asm-arm/arch-ns9xxx/clock.h
+++ b/include/asm-arm/arch-ns9xxx/clock.h
--- a/include/asm-arm/arch-ns9xxx/hardware.h
+++ b/include/asm-arm/arch-ns9xxx/hardware.h
--- a/include/asm-arm/arch-ns9xxx/processor.h
+++ b/include/asm-arm/arch-ns9xxx/processor.h
--- a/include/asm-arm/arch-ns9xxx/regs-sys.h
+++ b/include/asm-arm/arch-ns9xxx/regs-sys.h
--- a/include/asm-arm/arch-pxa/i2c.h
+++ b/include/asm-arm/arch-pxa/i2c.h
--- a/include/asm-arm/arch-pxa/mmc.h
+++ b/include/asm-arm/arch-pxa/mmc.h
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
--- a/include/asm-arm/arch-pxa/pxa27x_keyboard.h
+++ b/include/asm-arm/arch-pxa/pxa27x_keyboard.h
--- a/include/asm-arm/arch-s3c2410/regs-ac97.h
+++ b/include/asm-arm/arch-s3c2410/regs-ac97.h
--- a/include/asm-arm/arch-s3c2410/regs-udc.h
+++ b/include/asm-arm/arch-s3c2410/regs-udc.h
--- a/include/asm-arm/ecard.h
+++ b/include/asm-arm/ecard.h
--- a/include/asm-arm/hardware/iop3xx.h
+++ b/include/asm-arm/hardware/iop3xx.h
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
--- a/include/asm-arm/mach/map.h
+++ b/include/asm-arm/mach/map.h
--- a/include/asm-arm/mach/mmc.h
+++ b/include/asm-arm/mach/mmc.h
--- a/include/asm-arm/mmu_context.h
+++ b/include/asm-arm/mmu_context.h
--- a/include/asm-arm/plat-s3c24xx/clock.h
+++ b/include/asm-arm/plat-s3c24xx/clock.h
--- a/include/asm-arm/plat-s3c24xx/cpu.h
+++ b/include/asm-arm/plat-s3c24xx/cpu.h
--- a/include/asm-arm/ptrace.h
+++ b/include/asm-arm/ptrace.h
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
--- a/include/asm-arm/thread_info.h
+++ b/include/asm-arm/thread_info.h
--- a/include/asm-arm26/mmu_context.h
+++ b/include/asm-arm26/mmu_context.h
--- a/include/asm-avr32/mmu_context.h
+++ b/include/asm-avr32/mmu_context.h
--- a/include/asm-avr32/scatterlist.h
+++ b/include/asm-avr32/scatterlist.h
--- a/include/asm-blackfin/Kbuild
+++ b/include/asm-blackfin/Kbuild
--- a/include/asm-blackfin/a.out.h
+++ b/include/asm-blackfin/a.out.h
--- a/include/asm-blackfin/atomic.h
+++ b/include/asm-blackfin/atomic.h
--- a/include/asm-blackfin/auxvec.h
+++ b/include/asm-blackfin/auxvec.h
--- a/include/asm-blackfin/bf5xx_timers.h
+++ b/include/asm-blackfin/bf5xx_timers.h
--- a/include/asm-blackfin/bfin-global.h
+++ b/include/asm-blackfin/bfin-global.h
--- a/include/asm-blackfin/bfin5xx_spi.h
+++ b/include/asm-blackfin/bfin5xx_spi.h
--- a/include/asm-blackfin/bfin_simple_timer.h
+++ b/include/asm-blackfin/bfin_simple_timer.h
--- a/include/asm-blackfin/bfin_sport.h
+++ b/include/asm-blackfin/bfin_sport.h
--- a/include/asm-blackfin/bitops.h
+++ b/include/asm-blackfin/bitops.h
--- a/include/asm-blackfin/blackfin.h
+++ b/include/asm-blackfin/blackfin.h
--- a/include/asm-blackfin/bug.h
+++ b/include/asm-blackfin/bug.h
--- a/include/asm-blackfin/bugs.h
+++ b/include/asm-blackfin/bugs.h
--- a/include/asm-blackfin/byteorder.h
+++ b/include/asm-blackfin/byteorder.h
--- a/include/asm-blackfin/cache.h
+++ b/include/asm-blackfin/cache.h
--- a/include/asm-blackfin/cacheflush.h
+++ b/include/asm-blackfin/cacheflush.h
--- a/include/asm-blackfin/checksum.h
+++ b/include/asm-blackfin/checksum.h
--- a/include/asm-blackfin/cplb.h
+++ b/include/asm-blackfin/cplb.h
--- a/include/asm-blackfin/cplbinit.h
+++ b/include/asm-blackfin/cplbinit.h
--- a/include/asm-blackfin/cpumask.h
+++ b/include/asm-blackfin/cpumask.h
--- a/include/asm-blackfin/cputime.h
+++ b/include/asm-blackfin/cputime.h
--- a/include/asm-blackfin/current.h
+++ b/include/asm-blackfin/current.h
--- a/include/asm-blackfin/delay.h
+++ b/include/asm-blackfin/delay.h
--- a/include/asm-blackfin/device.h
+++ b/include/asm-blackfin/device.h
--- a/include/asm-blackfin/div64.h
+++ b/include/asm-blackfin/div64.h
--- a/include/asm-blackfin/dma-mapping.h
+++ b/include/asm-blackfin/dma-mapping.h
--- a/include/asm-blackfin/dma.h
+++ b/include/asm-blackfin/dma.h
--- a/include/asm-blackfin/dpmc.h
+++ b/include/asm-blackfin/dpmc.h
--- a/include/asm-blackfin/elf.h
+++ b/include/asm-blackfin/elf.h
--- a/include/asm-blackfin/emergency-restart.h
+++ b/include/asm-blackfin/emergency-restart.h
--- a/include/asm-blackfin/entry.h
+++ b/include/asm-blackfin/entry.h
--- a/include/asm-blackfin/errno.h
+++ b/include/asm-blackfin/errno.h
--- a/include/asm-blackfin/fcntl.h
+++ b/include/asm-blackfin/fcntl.h
--- a/include/asm-blackfin/flat.h
+++ b/include/asm-blackfin/flat.h
--- a/include/asm-blackfin/futex.h
+++ b/include/asm-blackfin/futex.h
--- a/include/asm-blackfin/gpio.h
+++ b/include/asm-blackfin/gpio.h
--- a/include/asm-blackfin/hardirq.h
+++ b/include/asm-blackfin/hardirq.h
--- a/include/asm-blackfin/hw_irq.h
+++ b/include/asm-blackfin/hw_irq.h
--- a/include/asm-blackfin/ide.h
+++ b/include/asm-blackfin/ide.h
--- a/include/asm-blackfin/io.h
+++ b/include/asm-blackfin/io.h
--- a/include/asm-blackfin/ioctl.h
+++ b/include/asm-blackfin/ioctl.h
--- a/include/asm-blackfin/ioctls.h
+++ b/include/asm-blackfin/ioctls.h
--- a/include/asm-blackfin/ipc.h
+++ b/include/asm-blackfin/ipc.h
--- a/include/asm-blackfin/ipcbuf.h
+++ b/include/asm-blackfin/ipcbuf.h
--- a/include/asm-blackfin/irq.h
+++ b/include/asm-blackfin/irq.h
--- a/Show more
+++ b/Show more