Merge tag 'media/v4.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Feb 2017 18:22:41 +0000 (10:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Feb 2017 18:22:41 +0000 (10:22 -0800)
Pull media fix from Mauro Carvalho Chehab:
 "A regression fix that makes the Siano driver to work again after the
  CONFIG_VMAP_STACK change"

* tag 'media/v4.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] siano: make it work again with CONFIG_VMAP_STACK


Trivial merge