Merge branch 'topic/tlv-chmap' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sat, 15 Sep 2012 14:32:31 +0000 (16:32 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 15 Sep 2012 14:32:31 +0000 (16:32 +0200)
This is a merge of a topic branch containing the support for the new
channel map API using control elements.

1  2 
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.h

Simple merge
Simple merge