diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:18 +0000 |
| commit | cb6bfd3de48e285d74217f6e847135b9c81e92c0 (patch) | |
| tree | 192065305ac6f9443741a881e2203753b59127c4 /sound/soc/omap | |
| parent | e89817d4af75fed92e03c36427a83357a95dabd3 (diff) | |
| parent | 2ca087bc9edafd7cd1e89d0ac61a31067985bd15 (diff) | |
| parent | a59aa180ea56004a8dd6ece93699adf5eacdf4d9 (diff) | |
| parent | 0db54e74a9e44afb92bc547277827258dbf5dc8f (diff) | |
| parent | f9911803e82a32c126c40dd6246ade2faf472cbc (diff) | |
| parent | 3c9390ad0fa642f42e437feae1c75bdd21e8e1bc (diff) | |
Merge remote-tracking branches 'asoc/topic/rx51', 'asoc/topic/samsung', 'asoc/topic/sh', 'asoc/topic/simple' and 'asoc/topic/sta32x' into asoc-next