summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-24 12:56:32 +0000
committerMark Brown <broonie@kernel.org>2014-12-24 12:56:32 +0000
commitf2ec1d3b25776051a9205289dab12e9401d33f8a (patch)
treeb000f2e002fc87c2afd768ca89fe3359bd0e5d61 /sound
parentc533b8e60ab27e8f8782a1997f8417561140f7f8 (diff)
parentdb2c1f9e38a38e0f9294b5a8a83d744f68fbe726 (diff)
parent25f97549b5a19a373922e07c3e0f0b0b56a49148 (diff)
parent27fd36ab135724ed9c648c57e5c0d0299bd7f67a (diff)
parent6087fcab7bd5122e7264504854ec77d5be0286ff (diff)
downloadlinux-f2ec1d3b25776051a9205289dab12e9401d33f8a.tar.gz
linux-f2ec1d3b25776051a9205289dab12e9401d33f8a.tar.bz2
linux-f2ec1d3b25776051a9205289dab12e9401d33f8a.zip
Merge remote-tracking branches 'asoc/fix/dwc', 'asoc/fix/intel', 'asoc/fix/rockchip' and 'asoc/fix/rt5677' into asoc-linus