Merge remote-tracking branch 'i7300_edac/linux_next'

Conflicts:
	arch/x86/kernel/cpu/mcheck/mce.c

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
index 08363b0421222b92b5765bd2116cf9d4ecfca4d9,9c03d9872086cd9d6d59b4b3b4cc4321d78ba423..63aad2742d8a20dddfc867ce7c24e7b3f393ddd1
--- 1/arch/x86/kernel/cpu/mcheck/mce.c
--- 2/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@@ -36,10 -37,12 +36,9 @@@
  #include <linux/fs.h>
  #include <linux/mm.h>
  #include <linux/debugfs.h>
- #include <linux/edac_mce.h>
 +#include <linux/irq_work.h>
  
  #include <asm/processor.h>
 -#include <asm/hw_irq.h>
 -#include <asm/apic.h>
 -#include <asm/idle.h>
 -#include <asm/ipi.h>
  #include <asm/mce.h>
  #include <asm/msr.h>
  

diff --cc include/linux/edac.h
Simple merge