diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-16 12:03:17 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-16 12:03:17 +0000 |
| commit | 33484c67398295108ab31e17b50b5a6fba1f5eef (patch) | |
| tree | 6ad12e99422243e5918702fff859c3b5963c5225 | |
| parent | af6b7a82fd2416d68bcf46d18d96de9b59e43b06 (diff) | |
| parent | c7d910b87d3c8e9fcf4077089ca4327c12eee099 (diff) | |
| parent | cdd3d2a93f08823a0b9802147dc28c99029dfdfd (diff) | |
Merge remote-tracking branches 'asoc/fix/sgtl5000' and 'asoc/fix/sn95031' into asoc-linus