diff options
| author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:53:25 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:53:25 +0000 |
| commit | dc42c6cb309e09fb81c235350b3a7e7976caf52f (patch) | |
| tree | e71f913806b01f70a60921f3bfb6392038d039a1 /include/uapi | |
| parent | da644e2edea7e3b03f4a9df15d9125902b52c804 (diff) | |
| parent | 4e2cc814eb2755df286ea890078fb636e1aa0f69 (diff) | |
| parent | dd5abb742071a962be4403f171063ed1e9d4202d (diff) | |
| parent | 222e728ca29b5976accd1fc520a716d168ee2ca5 (diff) | |
| parent | 4090d63b49d7d440ff984db3715d5c780209e8e8 (diff) | |
| parent | f196e9ac07ed1212ce7d106c07a25019c9c1ee18 (diff) | |
Merge remote-tracking branches 'asoc/topic/tlv320aic31xx', 'asoc/topic/topology', 'asoc/topic/uda1380', 'asoc/topic/wm2200' and 'asoc/topic/wm8523' into asoc-next