From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Aug 2011 01:10:35 +0000 (+1000)
Subject: Merge remote-tracking branch 'i7300_edac/linux_next'
X-Git-Tag: next-20110810~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f94249d0c7d3458d9ebb31784afbf02ff11d4cec;p=karo-tx-linux.git

Merge remote-tracking branch 'i7300_edac/linux_next'

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

f94249d0c7d3458d9ebb31784afbf02ff11d4cec
diff --cc arch/x86/kernel/cpu/mcheck/mce.c
index 08363b042122,9c03d9872086..63aad2742d8a
--- a/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>