summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-16 12:03:17 +0000
committerMark Brown <broonie@kernel.org>2015-03-16 12:03:17 +0000
commit33484c67398295108ab31e17b50b5a6fba1f5eef (patch)
tree6ad12e99422243e5918702fff859c3b5963c5225
parentaf6b7a82fd2416d68bcf46d18d96de9b59e43b06 (diff)
parentc7d910b87d3c8e9fcf4077089ca4327c12eee099 (diff)
parentcdd3d2a93f08823a0b9802147dc28c99029dfdfd (diff)
Merge remote-tracking branches 'asoc/fix/sgtl5000' and 'asoc/fix/sn95031' into asoc-linus