summaryrefslogtreecommitdiffstats
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-24 12:56:42 +0000
committerMark Brown <broonie@kernel.org>2014-12-24 12:56:42 +0000
commitbf85139278b000b9baa83fd5de0162c605a3cefa (patch)
tree5911a33e674c47911e9962152cff978090057080 /sound/soc/rockchip
parentfc592b3b0f4ff29776d0bffdc131790cd4c6104b (diff)
parentafa8603c6253204bf96c88739f711e89c2b00cd5 (diff)
parent85b88a8dd0c758464f31a9758deb27b31c0d5de7 (diff)
parent97d62a3096355168db71bdcbc618cbf2c3b7c2a0 (diff)
downloadblackbird-obmc-linux-bf85139278b000b9baa83fd5de0162c605a3cefa.tar.gz
blackbird-obmc-linux-bf85139278b000b9baa83fd5de0162c605a3cefa.zip
Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/intel' and 'asoc/topic/omap' into asoc-next
OpenPOWER on IntegriCloud