From: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/avr32/kernel/traps.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff -puN arch/avr32/kernel/traps.c~git-avr32-fixup arch/avr32/kernel/traps.c
--- a/arch/avr32/kernel/traps.c~git-avr32-fixup
+++ a/arch/avr32/kernel/traps.c
@@ -17,9 +17,8 @@
 #include <asm/addrspace.h>
 #include <asm/mmu_context.h>
 #include <asm/ocd.h>
-<<<<<<< HEAD/arch/avr32/kernel/traps.c
-#include <asm/mmu_context.h>
-#include <asm/uaccess.h>
+#include <asm/sysreg.h>
+#include <asm/traps.h>
 
 static void dump_mem(const char *str, unsigned long bottom, unsigned long top)
 {
@@ -152,10 +151,6 @@ void dump_stack(void)
 	show_stack(NULL, NULL);
 }
 EXPORT_SYMBOL(dump_stack);
-=======
-#include <asm/sysreg.h>
-#include <asm/traps.h>
->>>>>>> /arch/avr32/kernel/traps.c
 
 ATOMIC_NOTIFIER_HEAD(avr32_die_chain);
 
_