--- /home/ynk/git.linaro.org/lin-lin-tra.lltconfigs/solutions/886efb590db144743c71795a2849d19c/drivers-video-Kconfig.orig	2012-05-17 21:16:22.451954956 +0400
+++ drivers/video/Kconfig	2012-05-17 21:16:58.819956201 +0400
@@ -25,11 +25,8 @@ source "drivers/gpu/stub/Kconfig"
 
 source "drivers/gpu/ion/Kconfig"
 
-<<<<<<< HEAD
-=======
 source "drivers/gpu/arm/Kconfig"
 
->>>>>>> rebase-samslt-mali
 config VGASTATE
        tristate
        default n