Merge branch 'linux-2.6' into powerpc-next

2026-11-13 07:31:07 +00:00 · 2008-05-16 23:13:42 +10:00 · 2008-05-16 23:13:42 +10:00 · fcff474ea5
commit fcff474ea5
parent 541b2755c2 f26a398891
504 changed files with 17040 additions and 5274 deletions
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
--- a/arch/ia64/ia32/ia32_support.c
+++ b/arch/ia64/ia32/ia32_support.c
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
--- a/arch/ia64/kernel/sal.c
+++ b/arch/ia64/kernel/sal.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
--- a/arch/ia64/uv/Makefile
+++ b/arch/ia64/uv/Makefile
--- a/arch/ia64/uv/kernel/Makefile
+++ b/arch/ia64/uv/kernel/Makefile
--- a/arch/ia64/uv/kernel/machvec.c
+++ b/arch/ia64/uv/kernel/machvec.c
--- a/arch/ia64/uv/kernel/setup.c
+++ b/arch/ia64/uv/kernel/setup.c
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
--- a/arch/mn10300/boot/install.sh
+++ b/arch/mn10300/boot/install.sh
--- a/arch/parisc/hpux/gate.S
+++ b/arch/parisc/hpux/gate.S
--- a/arch/parisc/hpux/wrappers.S
+++ b/arch/parisc/hpux/wrappers.S
--- a/arch/parisc/kernel/Makefile
+++ b/arch/parisc/kernel/Makefile
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
--- a/arch/parisc/kernel/inventory.c
+++ b/arch/parisc/kernel/inventory.c
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
--- a/arch/parisc/kernel/perf_asm.S
+++ b/arch/parisc/kernel/perf_asm.S
--- a/arch/parisc/kernel/real2.S
+++ b/arch/parisc/kernel/real2.S
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
--- a/arch/parisc/lib/fixup.S
+++ b/arch/parisc/lib/fixup.S
--- a/arch/parisc/lib/lusercopy.S
+++ b/arch/parisc/lib/lusercopy.S
--- a/arch/parisc/lib/memcpy.c
+++ b/arch/parisc/lib/memcpy.c
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
--- a/arch/powerpc/mm/slb_low.S
+++ b/arch/powerpc/mm/slb_low.S
--- a/arch/powerpc/platforms/cell/io-workarounds.c
+++ b/arch/powerpc/platforms/cell/io-workarounds.c
--- a/arch/powerpc/platforms/cell/io-workarounds.h
+++ b/arch/powerpc/platforms/cell/io-workarounds.h
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
--- a/arch/sh/kernel/kgdb_stub.c
+++ b/arch/sh/kernel/kgdb_stub.c
--- a/arch/sparc/kernel/sys_sparc.c
+++ b/arch/sparc/kernel/sys_sparc.c
--- a/arch/sparc64/kernel/rtrap.S
+++ b/arch/sparc64/kernel/rtrap.S
--- a/arch/sparc64/kernel/signal.c
+++ b/arch/sparc64/kernel/signal.c
--- a/arch/sparc64/kernel/signal32.c
+++ b/arch/sparc64/kernel/signal32.c
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
--- a/arch/um/Kconfig.char
+++ b/arch/um/Kconfig.char
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
--- a/arch/um/drivers/cow_sys.h
+++ b/arch/um/drivers/cow_sys.h
--- a/arch/um/drivers/daemon_user.c
+++ b/arch/um/drivers/daemon_user.c
--- a/arch/um/drivers/fd.c
+++ b/arch/um/drivers/fd.c
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
--- a/arch/um/drivers/mcast_user.c
+++ b/arch/um/drivers/mcast_user.c
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
--- a/arch/um/drivers/port_user.c
+++ b/arch/um/drivers/port_user.c
--- a/arch/um/drivers/pty.c
+++ b/arch/um/drivers/pty.c
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
--- a/arch/um/drivers/tty.c
+++ b/arch/um/drivers/tty.c
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
--- a/arch/um/include/as-layout.h
+++ b/arch/um/include/as-layout.h
--- a/arch/um/include/line.h
+++ b/arch/um/include/line.h
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
--- a/arch/um/include/process.h
+++ b/arch/um/include/process.h
--- a/arch/um/include/skas_ptrace.h
+++ b/arch/um/include/skas_ptrace.h
--- a/arch/um/include/sysdep-i386/ptrace_user.h
+++ b/arch/um/include/sysdep-i386/ptrace_user.h
--- a/arch/um/include/sysdep-i386/sigcontext.h
+++ b/arch/um/include/sysdep-i386/sigcontext.h
--- a/arch/um/include/sysdep-x86_64/ptrace_user.h
+++ b/arch/um/include/sysdep-x86_64/ptrace_user.h
--- a/arch/um/include/um_malloc.h
+++ b/arch/um/include/um_malloc.h
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
--- a/arch/um/os-Linux/drivers/ethertap_user.c
+++ b/arch/um/os-Linux/drivers/ethertap_user.c
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
--- a/arch/um/os-Linux/sys-i386/registers.c
+++ b/arch/um/os-Linux/sys-i386/registers.c
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
--- a/arch/um/sys-i386/ptrace.c
+++ b/arch/um/sys-i386/ptrace.c
--- a/arch/um/sys-i386/user-offsets.c
+++ b/arch/um/sys-i386/user-offsets.c
--- a/arch/um/sys-x86_64/user-offsets.c
+++ b/arch/um/sys-x86_64/user-offsets.c
--- a/arch/x86/kernel/acpi/realmode/wakeup.lds.S
+++ b/arch/x86/kernel/acpi/realmode/wakeup.lds.S
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
--- a/Show more
+++ b/Show more