summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-01-10 10:47:54 +0000
committerMark Brown <broonie@kernel.org>2017-01-10 10:47:54 +0000
commit42e0ebdef53d91891939a475c6ef23970829ff99 (patch)
tree96e44a343596d314fc66d94618cbb9316776fa4e /sound
parent1c681a1921e55628abd9cde2431c166ef8a6b993 (diff)
parenta1792cda51300e15b03549cccf0b09f3be82e697 (diff)
parent02c5c03283c52157d336abf5e44ffcda10579fbf (diff)
parent63c3194b82530bd71fd49db84eb7ab656b8d404a (diff)
parentc2b36129ce53a22b89dd2b88db33e7ffdefe0f41 (diff)
Merge remote-tracking branches 'asoc/fix/nau8825', 'asoc/fix/rt5645', 'asoc/fix/tlv320aic3x' and 'asoc/fix/topology' into asoc-linus