--- /home/ynk/git.linaro.org/lin-lin-tra.lltconfigs/solutions/886efb590db144743c71795a2849d19c/arch-arm-mach-exynos-mach-origen.c.orig	2012-05-17 21:15:42.247953580 +0400
+++ arch/arm/mach-exynos/mach-origen.c	2012-05-17 21:16:22.411954955 +0400
@@ -22,12 +22,9 @@
 #include <linux/mfd/max8997.h>
 #include <linux/lcd.h>
 #include <linux/rfkill-gpio.h>
-<<<<<<< HEAD
 #include <linux/ath6kl.h>
 #include <linux/delay.h>
-=======
 #include <linux/pm_domain.h>
->>>>>>> rebase-samslt-mali
 
 #include <asm/mach/arch.h>
 #include <asm/hardware/gic.h>