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: v3.14-rc1~143^2~1^2~38^2~4^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07ac582c85ead1b972232560832c26fec09dfe04;p=pandora-kernel.git Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-core Conflicts (Trivial add/delete): sound/soc/soc-pcm.c --- 07ac582c85ead1b972232560832c26fec09dfe04 Reading git-diff-tree failed