From: Mark Brown Date: Wed, 4 Mar 2015 20:42:37 +0000 (+0000) Subject: Merge remote-tracking branch 'asoc/fix/atmel-build' into asoc-linus X-Git-Tag: v4.0-rc3~14^2^2~11 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=64a071331ac773d39a20e266fc640cc7cd99277e;p=karo-tx-linux.git Merge remote-tracking branch 'asoc/fix/atmel-build' into asoc-linus --- 64a071331ac773d39a20e266fc640cc7cd99277e