Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/davinci', 'asoc/topic...

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/atmel/atmel_ssc_dai.c
Simple merge

diff --cc sound/soc/intel/sst/sst.c
Simple merge