Skip to content
Commit 0e19e7d2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/fix/hda' into topic/hda 

Conflicts:
	sound/pci/hda/patch_sigmatel.c
parents 82894b6f f73d3585
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment