aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-07 16:07:50 +0100
committerMark Brown <broonie@kernel.org>2015-10-07 16:07:50 +0100
commite4fc141d2a022a63c87a4851b3c688eca6a1647b (patch)
tree4b0cfe1164f6c20b751cf34940d2c47a87118388 /sound
parent1e2fa4cfdbf21b3c071e0d9739dce5aac9edcb85 (diff)
parent2d1180e36905bf92892e265c662e5e597be01505 (diff)
parent57622aef86d21d459e937c72f578050ff4a91af5 (diff)
downloadlinux-e4fc141d2a022a63c87a4851b3c688eca6a1647b.tar.gz
Merge remote-tracking branches 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8962' into asoc-linus