From: Mark Brown Date: Wed, 4 Dec 2013 11:54:29 +0000 (+0000) Subject: Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-core X-Git-Tag: firefly_0821_release~176^2~4492^2~11^2^2~5^2~6 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=07ac582c85ead1b972232560832c26fec09dfe04;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-core Conflicts (Trivial add/delete): sound/soc/soc-pcm.c --- 07ac582c85ead1b972232560832c26fec09dfe04