Merge tag 'v3.7-rc5' into execve

Linux 3.7-rc5

Conflicts:
	arch/arm64/kernel/process.c

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 75b212d5db9d..20b688c81956 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1,6 +1,7 @@
 config ARM64
         def_bool y
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
         select GENERIC_CLOCKEVENTS
         select GENERIC_HARDIRQS_NO_DEPRECATED
         select GENERIC_IOMAP
@@ -24,6 +25,7 @@ config ARM64
         select HAVE_PERF_EVENTS
         select HAVE_SPARSE_IRQ
         select IRQ_DOMAIN
+        select MODULES_USE_ELF_RELA
         select NO_BOOTMEM
         select OF
         select OF_EARLY_FLATTREE