From: Takashi Iwai Date: Thu, 9 Jul 2009 16:48:38 +0000 (+0200) Subject: Merge branch 'fix/hda' into topic/hda X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=305355aad89f1b7eb27cb210fad2f9d3c67b2572;p=linux-beck.git Merge branch 'fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_realtek.c Signed-off-by: Takashi Iwai --- 305355aad89f1b7eb27cb210fad2f9d3c67b2572