ARM: OMAP: Manually merge drivers/Kconfig
authorTony Lindgren <tony@atomide.com>
Thu, 19 Jan 2006 19:12:27 +0000 (11:12 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 19 Jan 2006 19:12:27 +0000 (11:12 -0800)
Manually merge drivers/Kconfig


No differences found