From: Tony Lindgren <tony@atomide.com>
Date: Thu, 19 Jan 2006 19:12:27 +0000 (-0800)
Subject: ARM: OMAP: Manually merge drivers/Kconfig
X-Git-Tag: v2.6.16-omap1~125
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aea20adecb31a38d6a911edc14718915e079a93;p=pandora-kernel.git

ARM: OMAP: Manually merge drivers/Kconfig

Manually merge drivers/Kconfig
---

Reading git-diff-tree failed