Merge branch 'quilt/rr'

Conflicts:
	arch/s390/Kconfig
	arch/xtensa/Kconfig

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/c6x/Kconfig
Simple merge

diff --cc arch/cris/Kconfig
Simple merge

diff --cc arch/m68k/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/include/asm/module.h
Simple merge

diff --cc arch/mips/kernel/module.c
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
index a7088dc06d2cd313d3bbf1a70a2310a171d5eaad,11cc724d118d0565744e6e4cbd9547bc9ae7389a..e9886e2677186614ff1f1000f4d6cd5aebda6b97
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -125,7 -123,8 +125,9 @@@ config S39
        select GENERIC_TIME_VSYSCALL
        select GENERIC_CLOCKEVENTS
        select KTIME_SCALAR if 32BIT
 +      select HAVE_ARCH_SECCOMP_FILTER
+       select HAVE_MOD_ARCH_SPECIFIC
+       select MODULES_USE_ELF_RELA
  
  config SCHED_OMIT_FRAME_POINTER
        def_bool y

diff --cc arch/unicore32/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/xtensa/Kconfig
index c161367386e467d48605069552fad89097859595,516210a605454666eb9f19b958f7c9030eeb76fe..8c82cd87082e43bf757e94c413419a7291feb2a1
--- 1/arch/xtensa/Kconfig
--- 2/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -11,7 -10,7 +11,8 @@@ config XTENS
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
 +      select GENERIC_PCI_IOMAP
+       select MODULES_USE_ELF_RELA
        help
          Xtensa processors are 32-bit RISC machines designed by Tensilica
          primarily for embedded systems.  These processors are both