diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-02 16:10:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-02 16:10:38 -0700 |
| commit | b601ce0fe3aafadba21cd42eb3d63660010e2a2b (patch) | |
| tree | b56c64c30801a8696e2f8961f9f1b50b44367b90 /crypto/ecb.c | |
| parent | 80ec7ce7bf50f57d0c37c09c5ed95f7f88370da1 (diff) | |
| parent | 90a5dbef1a66e9f55b76ccb83c0ef27c0bd87c27 (diff) | |
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"
Diffstat (limited to 'crypto/ecb.c')
0 files changed, 0 insertions, 0 deletions