diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-13 19:51:49 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-13 19:51:49 +0900 |
| commit | 901e513a4dd5e35189f15d2a2f95017f7224b6b3 (patch) | |
| tree | ff7e7dfaa359a90ecd085887f53d9c7b38b0004e /crypto/blowfish_common.c | |
| parent | af900a7ee6a17784a9a343421ef0e3fe67f264fc (diff) | |
| parent | d2c56720227390950778fd43dde056b11c2a2e7f (diff) | |
| download | linux-crypto-901e513a4dd5e35189f15d2a2f95017f7224b6b3.tar.gz linux-crypto-901e513a4dd5e35189f15d2a2f95017f7224b6b3.zip | |
Merge tag 'media/v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
"Two regression fixes:
- a regression when handling VIDIOC_CROPCAP at the media core;
- a regression at adv7604 that was ignoring pad number in subdev ops"
* tag 'media/v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] adv7604: Don't ignore pad number in subdev DV timings pad operations
[media] v4l2-ioctl: fix stupid mistake in cropcap condition
Diffstat (limited to 'crypto/blowfish_common.c')
0 files changed, 0 insertions, 0 deletions