From: Tony Lindgren <tony@atomide.com>
Date: Fri, 28 Apr 2006 07:32:21 +0000 (-0700)
Subject: Manually merge sound/oss/Kconfig
X-Git-Tag: v2.6.17-omap1~99
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9ba6770a2279b2b3f286ac42bb98a8e17cb0ff5;p=pandora-kernel.git

Manually merge sound/oss/Kconfig
---

Reading git-diff-tree failed