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)
commit41b394bc612b0b96a8f015ac716ded6ef0ca9e0f
treed9546d39b216ab49903f3208d316837451411a9c
parent652ffbeaf10a4e33bd60f862049414ec7413f1a7
parentdbfe60caca2e8323efa7aba6762dce7be2eba390
Merge commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390'

* 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>