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

Conflicts: include/asm-x86/statfs.h
2026-09-26 18:16:26 +00:00 · 2008-10-13 17:13:56 +01:00 · 2008-10-13 17:13:56 +01:00 · e758936e02
commit e758936e02
parent 239cfbde1f 4480f15b33
5026 changed files with 306502 additions and 203200 deletions
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
--- a/include/asm-generic/syscall.h
+++ b/include/asm-generic/syscall.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/asm-mips/Kbuild
+++ b/include/asm-mips/Kbuild
--- a/include/asm-mips/abi.h
+++ b/include/asm-mips/abi.h
--- a/include/asm-mips/addrspace.h
+++ b/include/asm-mips/addrspace.h
--- a/include/asm-mips/asm.h
+++ b/include/asm-mips/asm.h
--- a/include/asm-mips/asmmacro-32.h
+++ b/include/asm-mips/asmmacro-32.h
--- a/include/asm-mips/asmmacro-64.h
+++ b/include/asm-mips/asmmacro-64.h
--- a/include/asm-mips/asmmacro.h
+++ b/include/asm-mips/asmmacro.h
--- a/include/asm-mips/atomic.h
+++ b/include/asm-mips/atomic.h
--- a/include/asm-mips/auxvec.h
+++ b/include/asm-mips/auxvec.h
--- a/include/asm-mips/barrier.h
+++ b/include/asm-mips/barrier.h
--- a/include/asm-mips/bcache.h
+++ b/include/asm-mips/bcache.h
--- a/include/asm-mips/bitops.h
+++ b/include/asm-mips/bitops.h
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
--- a/include/asm-mips/branch.h
+++ b/include/asm-mips/branch.h
--- a/include/asm-mips/break.h
+++ b/include/asm-mips/break.h
--- a/include/asm-mips/bug.h
+++ b/include/asm-mips/bug.h
--- a/include/asm-mips/bugs.h
+++ b/include/asm-mips/bugs.h
--- a/include/asm-mips/byteorder.h
+++ b/include/asm-mips/byteorder.h
--- a/include/asm-mips/cache.h
+++ b/include/asm-mips/cache.h
--- a/include/asm-mips/cachectl.h
+++ b/include/asm-mips/cachectl.h
--- a/include/asm-mips/cacheflush.h
+++ b/include/asm-mips/cacheflush.h
--- a/include/asm-mips/cacheops.h
+++ b/include/asm-mips/cacheops.h
--- a/include/asm-mips/cevt-r4k.h
+++ b/include/asm-mips/cevt-r4k.h
--- a/include/asm-mips/checksum.h
+++ b/include/asm-mips/checksum.h
--- a/include/asm-mips/cmp.h
+++ b/include/asm-mips/cmp.h
--- a/include/asm-mips/cmpxchg.h
+++ b/include/asm-mips/cmpxchg.h
--- a/include/asm-mips/compat-signal.h
+++ b/include/asm-mips/compat-signal.h
--- a/include/asm-mips/compat.h
+++ b/include/asm-mips/compat.h
--- a/include/asm-mips/compiler.h
+++ b/include/asm-mips/compiler.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/cpu.h
+++ b/include/asm-mips/cpu.h
--- a/include/asm-mips/cputime.h
+++ b/include/asm-mips/cputime.h
--- a/include/asm-mips/current.h
+++ b/include/asm-mips/current.h
--- a/include/asm-mips/debug.h
+++ b/include/asm-mips/debug.h
--- a/include/asm-mips/dec/ecc.h
+++ b/include/asm-mips/dec/ecc.h
--- a/include/asm-mips/dec/interrupts.h
+++ b/include/asm-mips/dec/interrupts.h
--- a/include/asm-mips/dec/ioasic.h
+++ b/include/asm-mips/dec/ioasic.h
--- a/include/asm-mips/dec/ioasic_addrs.h
+++ b/include/asm-mips/dec/ioasic_addrs.h
--- a/include/asm-mips/dec/ioasic_ints.h
+++ b/include/asm-mips/dec/ioasic_ints.h
--- a/include/asm-mips/dec/kn01.h
+++ b/include/asm-mips/dec/kn01.h
--- a/include/asm-mips/dec/kn02.h
+++ b/include/asm-mips/dec/kn02.h
--- a/include/asm-mips/dec/kn02ba.h
+++ b/include/asm-mips/dec/kn02ba.h
--- a/include/asm-mips/dec/kn02ca.h
+++ b/include/asm-mips/dec/kn02ca.h
--- a/include/asm-mips/dec/kn02xa.h
+++ b/include/asm-mips/dec/kn02xa.h
--- a/include/asm-mips/dec/kn03.h
+++ b/include/asm-mips/dec/kn03.h
--- a/include/asm-mips/dec/kn05.h
+++ b/include/asm-mips/dec/kn05.h
--- a/include/asm-mips/dec/kn230.h
+++ b/include/asm-mips/dec/kn230.h
--- a/include/asm-mips/dec/machtype.h
+++ b/include/asm-mips/dec/machtype.h
--- a/include/asm-mips/dec/prom.h
+++ b/include/asm-mips/dec/prom.h
--- a/include/asm-mips/dec/system.h
+++ b/include/asm-mips/dec/system.h
--- a/include/asm-mips/delay.h
+++ b/include/asm-mips/delay.h
--- a/include/asm-mips/device.h
+++ b/include/asm-mips/device.h
--- a/include/asm-mips/div64.h
+++ b/include/asm-mips/div64.h
--- a/include/asm-mips/dma-mapping.h
+++ b/include/asm-mips/dma-mapping.h
--- a/include/asm-mips/dma.h
+++ b/include/asm-mips/dma.h
--- a/include/asm-mips/ds1286.h
+++ b/include/asm-mips/ds1286.h
--- a/include/asm-mips/ds1287.h
+++ b/include/asm-mips/ds1287.h
--- a/include/asm-mips/dsp.h
+++ b/include/asm-mips/dsp.h
--- a/include/asm-mips/edac.h
+++ b/include/asm-mips/edac.h
--- a/include/asm-mips/elf.h
+++ b/include/asm-mips/elf.h
--- a/include/asm-mips/emergency-restart.h
+++ b/include/asm-mips/emergency-restart.h
--- a/include/asm-mips/emma2rh/emma2rh.h
+++ b/include/asm-mips/emma2rh/emma2rh.h
--- a/include/asm-mips/emma2rh/markeins.h
+++ b/include/asm-mips/emma2rh/markeins.h
--- a/include/asm-mips/errno.h
+++ b/include/asm-mips/errno.h
--- a/include/asm-mips/fb.h
+++ b/include/asm-mips/fb.h
--- a/include/asm-mips/fcntl.h
+++ b/include/asm-mips/fcntl.h
--- a/include/asm-mips/fixmap.h
+++ b/include/asm-mips/fixmap.h
--- a/include/asm-mips/floppy.h
+++ b/include/asm-mips/floppy.h
--- a/include/asm-mips/fpregdef.h
+++ b/include/asm-mips/fpregdef.h
--- a/include/asm-mips/fpu.h
+++ b/include/asm-mips/fpu.h
--- a/include/asm-mips/fpu_emulator.h
+++ b/include/asm-mips/fpu_emulator.h
--- a/include/asm-mips/futex.h
+++ b/include/asm-mips/futex.h
--- a/include/asm-mips/fw/arc/hinv.h
+++ b/include/asm-mips/fw/arc/hinv.h
--- a/include/asm-mips/fw/arc/types.h
+++ b/include/asm-mips/fw/arc/types.h
--- a/include/asm-mips/fw/cfe/cfe_api.h
+++ b/include/asm-mips/fw/cfe/cfe_api.h
--- a/include/asm-mips/fw/cfe/cfe_error.h
+++ b/include/asm-mips/fw/cfe/cfe_error.h
--- a/include/asm-mips/gcmpregs.h
+++ b/include/asm-mips/gcmpregs.h
--- a/include/asm-mips/gic.h
+++ b/include/asm-mips/gic.h
--- a/include/asm-mips/gpio.h
+++ b/include/asm-mips/gpio.h
--- a/include/asm-mips/gt64120.h
+++ b/include/asm-mips/gt64120.h
--- a/include/asm-mips/hardirq.h
+++ b/include/asm-mips/hardirq.h
--- a/include/asm-mips/hazards.h
+++ b/include/asm-mips/hazards.h
--- a/include/asm-mips/highmem.h
+++ b/include/asm-mips/highmem.h
--- a/include/asm-mips/hw_irq.h
+++ b/include/asm-mips/hw_irq.h
--- a/include/asm-mips/i8253.h
+++ b/include/asm-mips/i8253.h
--- a/include/asm-mips/i8259.h
+++ b/include/asm-mips/i8259.h
--- a/include/asm-mips/ide.h
+++ b/include/asm-mips/ide.h
--- a/include/asm-mips/inst.h
+++ b/include/asm-mips/inst.h
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
--- a/include/asm-mips/ioctl.h
+++ b/include/asm-mips/ioctl.h
--- a/include/asm-mips/ioctls.h
+++ b/include/asm-mips/ioctls.h
--- a/include/asm-mips/ip32/crime.h
+++ b/include/asm-mips/ip32/crime.h
--- a/include/asm-mips/ip32/ip32_ints.h
+++ b/include/asm-mips/ip32/ip32_ints.h
--- a/Show more
+++ b/Show more