Merge branch 'quilt/rr'

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/cris/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/kernel/Makefile
index 2dbecf843d74648888dfb4395ad9a66f485dd03d,cd1e6c2421b2378a2863489cb4db26f5977ba1d5..a61deb354a2b8b425cb7d6533b316c00f3561497
--- 1/arch/mips/kernel/Makefile
--- 2/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@@ -31,15 -31,32 +31,16 @@@ obj-$(CONFIG_SYNC_R4K)             += sync-r4k.
  
  obj-$(CONFIG_STACKTRACE)      += stacktrace.o
  obj-$(CONFIG_MODULES)         += mips_ksyms.o module.o
+ obj-$(CONFIG_MODULES_USE_ELF_RELA) += module-rela.o
  
 +obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
  obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o
  
 -obj-$(CONFIG_CPU_LOONGSON2)   += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_MIPS32)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_MIPS64)      += r4k_fpu.o r4k_switch.o
 +obj-$(CONFIG_CPU_R4K_FPU)     += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_R3000)               += r2300_fpu.o r2300_switch.o
 -obj-$(CONFIG_CPU_R4300)               += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R4X00)               += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R5000)               += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_R6000)               += r6000_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R5432)               += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R5500)               += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R8000)               += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_RM7000)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_RM9000)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_NEVADA)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R10000)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_SB1)         += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_TX39XX)      += r2300_fpu.o r2300_switch.o
 -obj-$(CONFIG_CPU_TX49XX)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_VR41XX)      += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_CAVIUM_OCTEON)       += octeon_switch.o
 -obj-$(CONFIG_CPU_XLR)         += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_XLP)         += r4k_fpu.o r4k_switch.o
  
  obj-$(CONFIG_SMP)             += smp.o
  obj-$(CONFIG_SMP_UP)          += smp-up.o

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
index e601340f277a45cae7083155acacc7dcaac1b790,a89230180fe39282ad854e1c451bdebf7499676e..2fd291547ffbebddbfcfc1a2934ace8424a2c632
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -657,13 -589,56 +659,12 @@@ config S390_GUES
        depends on 64BIT && EXPERIMENTAL
        select VIRTUALIZATION
        select VIRTIO
-       select VIRTIO_RING
        select VIRTIO_CONSOLE
        help
 -        Select this option if you want to run the kernel as a guest under
 -        the KVM hypervisor. This will add detection for KVM as well  as a
 -        virtio transport. If KVM is detected, the virtio console will be
 -        the default console.
 -
 -config SECCOMP
 -      def_bool y
 -      prompt "Enable seccomp to safely compute untrusted bytecode"
 -      depends on PROC_FS
 -      help
 -        This kernel feature is useful for number crunching applications
 -        that may need to compute untrusted bytecode during their
 -        execution. By using pipes or other transports made available to
 -        the process as file descriptors supporting the read/write
 -        syscalls, it's possible to isolate those applications in
 -        their own address space using seccomp. Once seccomp is
 -        enabled via /proc/<pid>/seccomp, it cannot be disabled
 -        and the task is only allowed to execute a few safe syscalls
 -        defined by each seccomp mode.
 -
 -        If unsure, say Y.
 -
 -endmenu
 +        Enabling this option adds support for virtio based paravirtual device
 +        drivers on s390.
  
 -menu "Power Management"
 -
 -source "kernel/power/Kconfig"
 +        Select this option if you want to run the kernel as a guest under
 +        the KVM hypervisor.
  
  endmenu
 -
 -source "net/Kconfig"
 -
 -config PCMCIA
 -      def_bool n
 -
 -config CCW
 -      def_bool y
 -
 -source "drivers/Kconfig"
 -
 -source "fs/Kconfig"
 -
 -source "arch/s390/Kconfig.debug"
 -
 -source "security/Kconfig"
 -
 -source "crypto/Kconfig"
 -
 -source "lib/Kconfig"
 -
 -source "arch/s390/kvm/Kconfig"

diff --cc arch/unicore32/Kconfig
Simple merge