Merge remote-tracking branch 'metag/for-next'

Conflicts:
	tools/perf/perf.h

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc tools/perf/perf.h
index 8a68ad39e1b67a286eb6862eaa16188052e082a3,768507e079e23901187d0aae1d1bb00fbe43c232..f284e0aade65f3ac9ecc9a4c6b4237afad9c4eca
--- 1/tools/perf/perf.h
--- 2/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@@ -98,12 -98,12 +98,18 @@@ void get_term_dimensions(struct winsiz
  #define CPUINFO_PROC  "cpu model"
  #endif
  
 +#ifdef __arc__
 +#define rmb()         asm volatile("" ::: "memory")
 +#define cpu_relax()   rmb()
 +#define CPUINFO_PROC  "Processor"
 +#endif
 +
+ #ifdef __metag__
+ #define rmb()         asm volatile("" ::: "memory")
+ #define cpu_relax()   asm volatile("" ::: "memory")
+ #define CPUINFO_PROC  "CPU"
+ #endif
+ 
  #include <time.h>
  #include <unistd.h>
  #include <sys/types.h>