Merge commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390'
authorJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 22:56:17 +0000 (19:56 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 22:56:17 +0000 (19:56 -0300)
* commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390':
  vf_hwupload_cuda: Add min/max limits for device option

This commit is a noop, see4df5a6a26a8aa08bbc6d027c2fb44fcf870e98d7

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge