diff options
| author | Mark Brown <broonie@kernel.org> | 2016-04-26 19:25:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-04-26 19:25:18 +0100 |
| commit | 8c0f55100478649e3c0133684aa4aebab77ce10f (patch) | |
| tree | f9827c1d562d354699772b016090fffbb754c83d /arch/s390 | |
| parent | 78cfca32cac26201d362fe9d2bf6f3c11a9f4a3b (diff) | |
| parent | 653aa4645244042826f105aab1be3d01b3d493ca (diff) | |
| parent | 33362c69c8e68281633a7c3a1d5c840e940097b7 (diff) | |
Merge remote-tracking branches 'asoc/fix/rt5640' and 'asoc/fix/wm8962' into asoc-linus