diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-05 08:42:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-05 08:42:06 -0700 |
| commit | c02d7da3dd00cb32b58d9c87240456e19eebcc42 (patch) | |
| tree | 67ff276435821368474c0d18558b26f7d11d12eb /lib/string.c | |
| parent | 5ebe6afaf0057ac3eaeb98defd5456894b446d22 (diff) | |
| parent | fefad2d54beb8aad6bf4ac6daeb74f86f52565de (diff) | |
Merge tag 'media/v4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
"Three driver fixes:
- fix for omap4, fixing a regression due to a subsystem API that got
removed for 4.1 (commit efde234674d9);
- fix for one of the formats supported by Marvel ccic driver;
- fix rcar_vin driver that, when stopping abnormally, the driver
can't return from wait_for_completion"
* tag 'media/v4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] v4l: omap4iss: Replace outdated OMAP4 control pad API with syscon
[media] media: soc_camera: rcar_vin: Fix wait_for_completion
[media] marvell-ccic: fix Y'CbCr ordering
Diffstat (limited to 'lib/string.c')
0 files changed, 0 insertions, 0 deletions