From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 13 Nov 2008 13:38:00 +0000 (+0100)
Subject: Merge branch 'topic/fix/hda' into topic/hda
X-Git-Tag: v2.6.29-rc1~590^2~6^2~97
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd80bc6f4811b48eb68716c8255bf7e5f0006caa;p=pandora-kernel.git

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

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

cd80bc6f4811b48eb68716c8255bf7e5f0006caa
Reading git-diff-tree failed