From: Mark Brown Date: Wed, 11 Sep 2013 10:17:14 +0000 (+0100) Subject: Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus X-Git-Tag: v3.12-rc1~43^2^2~4 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=29dc5dd229dc3130b51df0932e59946fc09d3bd4;p=users%2Fwilly%2Fxarray.git Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus --- 29dc5dd229dc3130b51df0932e59946fc09d3bd4