diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-22 22:01:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-22 22:01:07 +0100 |
| commit | 98810a6dcf8af768d7b0b71e5075ff9c199f5196 (patch) | |
| tree | 4b2967dee40ee4d7269fd0b2c59088b4d9bc1286 /Documentation/DocBook/media/v4l/vidioc-g-fmt.xml | |
| parent | 22e0c1428061dd28046c7138b75dbd77f73e4e5a (diff) | |
| parent | 95e9ee92e20162681e9f65c25962e0606db9d149 (diff) | |
| parent | eebdec044e82a4c694b7c1f4996e3ab82d64482c (diff) | |
| parent | 79861bbb759053a9b91026becc0915d0f1f8d37d (diff) | |
| parent | eb4dd20c2ac9ad394401694d8762e0a13bc469ef (diff) | |
| parent | 3b5b24315781c744ab3868edee931ddb2145e6b5 (diff) | |
Merge remote-tracking branches 'asoc/fix/intel', 'asoc/fix/jz4740', 'asoc/fix/rcar', 'asoc/fix/tlv320aic31xx' and 'asoc/fix/tlv320aic3x' into asoc-linus