diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-21 12:43:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-21 12:43:23 -0700 |
| commit | 8898159650093e9eee8829e30a9139b4273a0ac4 (patch) | |
| tree | 46c5d9660416d790951153ffd8ca1446a53e96dd /fs/ncpfs/getopt.c | |
| parent | 9f24ff6f4236f117729bdb2fe8b0c202ce86098f (diff) | |
| parent | e631f578048e2afd8bfede2e9dc86aa4592def3a (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- Fixes a regression at DVB core when switching from DVB-S2 to DVB-S on
Kaffeine (Fedora 16 Bugzilla #812895);
- Fixes a mutex unlock at an error condition at drx-k;
- Fix winbond-cir set mode;
- mt9m032: Fix a compilation breakage with some random Kconfig;
- mt9m032: fix two dead locks;
- xc5000: don't require an special firmware (that won't be provided by
the vendor) just because the xtal frequency is different;
- V4L DocBook: fix some typos at multi-plane formats description.
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] xc5000: support 32MHz & 31.875MHz xtal using the 41.024.5 firmware
[media] V4L: mt9m032: fix compilation breakage
[media] V4L: DocBook: Fix typos in the multi-plane formats description
[media] V4L: mt9m032: fix two dead-locks
[media] rc-core: set mode for winbond-cir
[media] drxk: Does not unlock mutex if sanity check failed in scu_command()
[media] dvb_frontend: Fix a regression when switching back to DVB-S
Diffstat (limited to 'fs/ncpfs/getopt.c')
0 files changed, 0 insertions, 0 deletions