Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Tue, 23 Aug 2011 13:02:36 +0000 (15:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 23 Aug 2011 13:02:36 +0000 (15:02 +0200)
commit5fa9b1511216282e27e048defae78c0f44c148d1
tree08c8a7ed74350ca48fb3c0ee70074c9fa6539e8b
parent188cd2b5c624880e31b49f93edd2669b51d118f4
parent1f015f5fdc4003f3f2a7c66efdb1acf7a2d230bf
Merge branch 'fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c