summaryrefslogtreecommitdiffstats
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-24 12:56:44 +0000
committerMark Brown <broonie@kernel.org>2014-12-24 12:56:44 +0000
commit7e00880eb5f74faeeada52099f3d67d3a932a5d4 (patch)
treea242174f839eda100bd1f901a84b54c2e8a240a4 /sound/soc/rockchip
parentbf85139278b000b9baa83fd5de0162c605a3cefa (diff)
parent7e0fc116c41f0ca93c4d3de6d26c223c92182857 (diff)
parentbba1431211e6fdc56680d98d2bdabaab1fd13b79 (diff)
parent026e73683ad5665a45b01ca1a221fa87e0e8e6fb (diff)
parent38d595e2e09ede17712b2d4909339e691fff3f85 (diff)
downloadlinux-7e00880eb5f74faeeada52099f3d67d3a932a5d4.tar.bz2
Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/rockchip', 'asoc/topic/rt5670' and 'asoc/topic/rt5677' into asoc-next