Merge branch 'topic/hda-gen-parser' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 23 Jan 2013 07:34:12 +0000 (08:34 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 23 Jan 2013 07:34:12 +0000 (08:34 +0100)
This is a merge of really big changes: the generic parser is heavily
enhanced for handling all cases, based on the former Realtek codec
driver code.  And all codec drivers except for a few ones (CA0132,
HDMI and modem) have been converted to use the new generic driver.

Conflicts:
sound/pci/hda/patch_realtek.c

1  2 
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_proc.c
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_realtek.c

Simple merge
Simple merge
Simple merge
Simple merge