From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Oct 2014 23:10:38 +0000 (-0700)
Subject: Merge tag 'media/v3.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: Ubuntu-5.0.0-8.9~10767
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b601ce0fe3aafadba21cd42eb3d63660010e2a2b;p=mirror_ubuntu-disco-kernel.git

Merge tag 'media/v3.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fix from Mauro Carvalho Chehab:
 "One last time regression fix at em28xx.  The removal of .reset_resume
  broke suspend/resume on this driver for some devices.

  There are more fixes to be done for em28xx suspend/resume to be better
  handled, but I'm opting to let them to stay for a while at the media
  devel tree, in order to get more tests.  So, for now, let's just
  revert this patch"

* tag 'media/v3.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  Revert "[media] media: em28xx - remove reset_resume interface"
---

b601ce0fe3aafadba21cd42eb3d63660010e2a2b