From: Takashi Iwai Date: Tue, 25 Nov 2008 14:20:57 +0000 (+0100) Subject: Merge branch 'topic/fix/hda' into topic/hda X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eefe93b9957e6f14780b7d37aeda0f27f341953d;p=linux-beck.git Merge branch 'topic/fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_sigmatel.c --- eefe93b9957e6f14780b7d37aeda0f27f341953d