Merge tag 'asoc-v3.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Thu, 5 Feb 2015 06:08:35 +0000 (07:08 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 5 Feb 2015 06:08:35 +0000 (07:08 +0100)
commita3ae255e3729c1bb4507412ea29be804f703d44c
treeedd1ca577dad5a0d701ae111519eaefa60896f98
parent3fe9cf390f6dc84f76b112b0a660967a84f9a81b
parent16ca41c6cc904d7eb9e92afc5f576e375c314f90
Merge tag 'asoc-v3.20-2' of git://git./linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.20

More updates for v3.20:

 - Lots of refactoring from Lars-Peter Clausen, moving drivers to more
   data driven initialization and rationalizing a lot of DAPM usage.
 - Much improved handling of CDCLK clocks on Samsung I2S controllers.
 - Lots of driver specific cleanups and feature improvements.
 - CODEC support for TI PCM514x and TLV320AIC3104 devices.
 - Board support for Tegra systems with Realtek RT5677.

Conflicts:
sound/soc/intel/sst-mfld-platform-pcm.c
include/sound/pcm.h
sound/core/pcm_lib.c