diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-07 17:17:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-07 17:17:45 +0200 |
| commit | 67601c3b64616c3bdb98c966e8f7cd5bb895e996 (patch) | |
| tree | 246f086c9b98a54bd8c0493042a1e7c5c54d238e /arch/nios2/boot | |
| parent | Merge branch 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | [media] media-device: fix builds when USB or PCI is compiled as module (diff) | |
| download | linux-67601c3b64616c3bdb98c966e8f7cd5bb895e996.tar.xz linux-67601c3b64616c3bdb98c966e8f7cd5bb895e996.zip | |
Merge tag 'media/v4.6-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- deadlock fixes on driver probe at exynos4-is and s43-camif drivers
- a build breakage if media controller is enabled and USB or PCI is
built as module.
* tag 'media/v4.6-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] media-device: fix builds when USB or PCI is compiled as module
[media] media: s3c-camif: fix deadlock on driver probe()
[media] media: exynos4-is: fix deadlock on driver probe
Diffstat (limited to 'arch/nios2/boot')
0 files changed, 0 insertions, 0 deletions