Merge pull request #9803 from wzw-intel:ocl_timer
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 9 Oct 2017 12:11:22 +0000 (12:11 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 9 Oct 2017 12:11:22 +0000 (12:11 +0000)

Trivial merge