From: Andrew Morton <akpm@osdl.org>

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

 drivers/crypto/Kconfig        |    3 ---
 drivers/crypto/Makefile       |    8 --------
 drivers/video/Kconfig         |    5 -----
 drivers/video/console/Kconfig |    5 -----
 4 files changed, 21 deletions(-)

diff -puN drivers/crypto/Makefile~git-geode-fixup drivers/crypto/Makefile
--- a/drivers/crypto/Makefile~git-geode-fixup
+++ a/drivers/crypto/Makefile
@@ -1,12 +1,4 @@
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK) += padlock.o
-<<<<<<< HEAD/drivers/crypto/Makefile
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
-=======
 obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
-
-padlock-objs-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
-
-padlock-objs := padlock-generic.o $(padlock-objs-y)
-
->>>>>>> /drivers/crypto/Makefile
diff -puN drivers/crypto/Kconfig~git-geode-fixup drivers/crypto/Kconfig
--- a/drivers/crypto/Kconfig~git-geode-fixup
+++ a/drivers/crypto/Kconfig
@@ -32,7 +32,6 @@ config CRYPTO_DEV_PADLOCK_AES
 	help
 	  Use VIA PadLock for AES algorithm.
 
-<<<<<<< HEAD/drivers/crypto/Kconfig
 	  Available in VIA C3 and newer CPUs.
 
 	  If unsure say M. The compiled module will be
@@ -52,7 +51,6 @@ config CRYPTO_DEV_PADLOCK_SHA
 	  If unsure say M. The compiled module will be
 	  called padlock-sha.ko
 
-=======
 config CRYPTO_DEV_GEODE
 	tristate "Support for the Geode LX AES engine"
 	depends on CRYPTO && X86_32
@@ -62,5 +60,4 @@ config CRYPTO_DEV_GEODE
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called geode-aes.
->>>>>>> /drivers/crypto/Kconfig
 endmenu
diff -puN drivers/video/console/Kconfig~git-geode-fixup drivers/video/console/Kconfig
--- a/drivers/video/console/Kconfig~git-geode-fixup
+++ a/drivers/video/console/Kconfig
@@ -5,13 +5,8 @@
 menu "Console display driver support"
 
 config VGA_CONSOLE
-<<<<<<< HEAD/drivers/video/console/Kconfig
-	bool "VGA text console" if EMBEDDED || !X86
-	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH
-=======
 	bool "VGA text console" if (EMBEDDED || !X86)
 	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !VGA_NOPROBE
->>>>>>> /drivers/video/console/Kconfig
 	default y
 	help
 	  Saying Y here will allow you to use Linux in text mode through a
diff -puN drivers/video/Kconfig~git-geode-fixup drivers/video/Kconfig
--- a/drivers/video/Kconfig~git-geode-fixup
+++ a/drivers/video/Kconfig
@@ -825,13 +825,8 @@ config FB_I810_I2C
 	help
 
 config FB_INTEL
-<<<<<<< HEAD/drivers/video/Kconfig
 	tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G support (EXPERIMENTAL)"
-	depends on FB && EXPERIMENTAL && PCI && X86
-=======
-	tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
 	depends on FB && EXPERIMENTAL && PCI && X86 && !VGA_NOPROBE
->>>>>>> /drivers/video/Kconfig
 	select AGP
 	select AGP_INTEL
 	select I2C_ALGOBIT if FB_INTEL_I2C
_