diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-08 13:12:00 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-08 13:12:00 +0000 |
| commit | addaeea9ee1979b033878a26b18d86ee9b90143e (patch) | |
| tree | 5ca0c7f4d0980352b663e452ed9163bd6adbb7ca /sound/soc/soc-jack.c | |
| parent | a6a21e6bca4f8cc349ebea5d96ccbb8fca8b6686 (diff) | |
| parent | 69434097916bc52a4d6d495a0d719eb02e0cff9e (diff) | |
| parent | 7bb73cbd073c495b5aed9ec446faa17a262f18be (diff) | |
| parent | 00d647b081b5ef2193fd15910fbd103f483a5d15 (diff) | |
| parent | 69b93607a9862b1db2f0f2e078e1396f8e20fa9b (diff) | |
| parent | 68d27bc63c4f331c912dfb92168f5fe4753c61c9 (diff) | |
Merge remote-tracking branches 'asoc/topic/hdmi', 'asoc/topic/intel', 'asoc/topic/jack', 'asoc/topic/jz4740' and 'asoc/topic/lm49453' into asoc-next