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

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

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

90d0be2fc33b4c4e11fc596da4736189be947d99
Reading git-diff-tree failed