From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 25 Nov 2008 14:20:57 +0000 (+0100)
Subject: Merge branch 'topic/fix/hda' into topic/hda
X-Git-Tag: v2.6.29-rc1~590^2~6^2~41
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eefe93b9957e6f14780b7d37aeda0f27f341953d;p=linux-2.6-omap-h63xx.git

Merge branch 'topic/fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_sigmatel.c
---

eefe93b9957e6f14780b7d37aeda0f27f341953d