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

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

 drivers/misc/Kconfig |    3 ---
 1 file changed, 3 deletions(-)

diff -puN drivers/misc/Kconfig~git-wireless-fixup drivers/misc/Kconfig
--- a/drivers/misc/Kconfig~git-wireless-fixup
+++ a/drivers/misc/Kconfig
@@ -187,7 +187,6 @@ config THINKPAD_ACPI_BAY
 
 	  If you are not sure, say Y here.
 
-<<<<<<< HEAD/drivers/misc/Kconfig
 config BLINK
 	tristate "Keyboard blink driver"
 	help
@@ -197,12 +196,10 @@ config BLINK
 	  a visual indication that the kernel is doing something.
 
 
-=======
 config EEPROM_93CX6
 	tristate "EEPROM 93CX6 support"
 	---help---
 	  This is a driver for the EEPROM chipsets 93c46 and 93c66.
 	  The driver supports both read as well as write commands.
 
->>>>>>> /drivers/misc/Kconfig
 endmenu
_