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: omap-for-v3.17/fixes-against-rc2~29^2~4^2~5^2~1 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b0e233ae500b2f4f32bedde36a27a57e99a775f;p=pandora-kernel.git Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus --- 6b0e233ae500b2f4f32bedde36a27a57e99a775f Reading git-diff-tree failed