OSDN Git Service

Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:26:53 +0000 (15:26 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:26:53 +0000 (15:26 +0000)
commitbc47d183c0745bdb93dcf4c17cd78cc59e27d024
treef3d666074d8dd5255c40d4cdb2d764a1ce2fe9a4
parentef179a742d1f4146d139b5e0a82e613ceea3eba4
parentfde7f9dbc71365230eeb8c8ea97ce9b552c8e5bd
Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next
sound/soc/rockchip/rk3399_gru_sound.c
sound/soc/rockchip/rockchip_i2s.c