Merge pull request #5474 from paroj:v4l2ctrls
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 23 Oct 2015 16:28:26 +0000 (16:28 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 23 Oct 2015 16:28:26 +0000 (16:28 +0000)

Trivial merge