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)
commit4695daefba8df8a11fa0b0edd595eedae9ea59ae
tree131579fda0b31b037e061e00deac2c52a33cd5ed
parent5a81e6a171cdbd1fa8bc1fdd80c23d3d71816fac
parentf9c85ee67164b37f9296eab3b754e543e4e96a1c
Merge tag 'media/v4.10-5' of git://git./linux/kernel/git/mchehab/linux-media

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