Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Sat, 9 Jul 2011 09:58:06 +0000 (11:58 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 9 Jul 2011 09:58:06 +0000 (11:58 +0200)
commit9975c2e4c3e4fc26148723dc99b5f0667716a249
tree81e6c0af47532303eb0fad0f7df04e866fdd7a3d
parent3e6179b8445bf76123cfab1e0af4833cc7618a4a
parentabaead6ac55dbda8b4bae40251d69dc3f0c49b1c
Merge branch 'fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_realtek.c