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

Fix conflicts between git-ubi and mainline

Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/mtd/Kconfig |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff -puN drivers/mtd/Kconfig~git-ubi-fixup drivers/mtd/Kconfig
--- a/drivers/mtd/Kconfig~git-ubi-fixup
+++ a/drivers/mtd/Kconfig
@@ -287,11 +287,6 @@ source "drivers/mtd/nand/Kconfig"
 
 source "drivers/mtd/onenand/Kconfig"
 
-<<<<<<< HEAD/drivers/mtd/Kconfig
-endif # MTD
-=======
 source "drivers/mtd/ubi/Kconfig"
 
-endmenu
-
->>>>>>> /drivers/mtd/Kconfig
+endif
_