Merge commit 'tip/master' into xen-tip/next

Merge commit 'tip/master' into xen-tip/next

* commit 'tip/master': (1150 commits)
  xen: use header for EXPORT_SYMBOL_GPL
  sched: avoid flexible array member inside struct (gcc extension)
  perf_counter: fix print debug irq disable
  genirq: fix comment to say IRQ_WAKE_THREAD
  lockdep: increase MAX_LOCKDEP_ENTRIES and MAX_LOCKDEP_CHAINS
  lockdep: increase MAX_LOCKDEP_ENTRIES
  lockdep: increase MAX_LOCKDEP_ENTRIES
  perf_counter: call hw_perf_save_disable/restore around group_sched_in
  x86: make sparse mem work in non-NUMA mode
  x86: process.c, remove useless headers
  x86: process.c, remove useless headers
  x86: make sparse mem work in non-NUMA mode
  x86: merge process.c a bit
  x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic
  ntp: fix comment typos
  ring-buffer: move code around to remove some branches
  ring-buffer: use internal time stamp function
  ring-buffer: small optimizations
  x86, 32-bit: fix kernel_trap_sp()
  sched: Don't export sched_mc_power_savings on multi-socket single core system
  ...

Conflicts:
	arch/x86/Kconfig
	arch/x86/kernel/cpu/mcheck/mce_64.c
	arch/x86/kernel/cpu/mcheck/mce_intel_64.c
	arch/x86/kernel/traps.c
	arch/x86/mm/init.c
	arch/x86/mm/pgtable.c
	include/linux/ring_buffer.h
	kernel/sysctl.c
	kernel/trace/ring_buffer.c
	mm/page_alloc.c