From: Mark Brown Date: Wed, 20 Dec 2017 15:43:04 +0000 (+0000) Subject: Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus X-Git-Tag: v4.15-rc6~27^2~5^2~3 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=57ef0a43d1227064d2988af0cff9055173a291b5;p=linux.git Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus --- 57ef0a43d1227064d2988af0cff9055173a291b5