From: Takashi Iwai Date: Tue, 23 Aug 2011 13:02:36 +0000 (+0200) Subject: Merge branch 'fix/hda' into topic/hda X-Git-Tag: v3.2-rc1~127^2~53 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fa9b1511216282e27e048defae78c0f44c148d1;p=pandora-kernel.git Merge branch 'fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_realtek.c --- 5fa9b1511216282e27e048defae78c0f44c148d1 Reading git-diff-tree failed