From: Mark Brown Date: Tue, 17 Jun 2014 14:54:28 +0000 (+0100) Subject: Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus X-Git-Tag: firefly_0821_release~176^2~3158^2~21^2~5^2~1 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6b0e233ae500b2f4f32bedde36a27a57e99a775f;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus --- 6b0e233ae500b2f4f32bedde36a27a57e99a775f