diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-06 16:28:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-06 16:28:37 +0100 |
| commit | 31d3483d81c200193db52b58f4c2b6560fbec347 (patch) | |
| tree | 2c7f5c12def5e076144296b413e8a5dc352ed0f2 /include/uapi | |
| parent | da11e36acc945798cd3b99ce04a5e8ba11c5d57a (diff) | |
| parent | debb97248741597fa9f38f563f2b9a17250ee4c5 (diff) | |
| parent | 76a822a6ae9c0c67309318bb60a4117329252fc4 (diff) | |
Merge remote-tracking branches 'asoc/topic/sunxi' and 'asoc/topic/topology' into asoc-next