diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-11 16:43:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-11 16:43:27 -0700 |
| commit | c15000b40d46c0affa4c142c4ecb7beee4ce03f3 (patch) | |
| tree | 14fe31249f9f8c882fecc63542821d6b431630c6 /mm/mlock.c | |
| parent | 9ddf7f5058c4f4badd38dba8d5896a5dbd7e716f (diff) | |
| parent | ddc6ff31cc22720c46c1547a5310ea260a968ae9 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] msp3400: fill in v4l2_tuner based on vt->type field
[media] tuner-core.c: don't change type field in g_tuner or g_frequency
[media] cx18/ivtv: fix g_tuner support
[media] tuner-core: power up tuner when called with s_power(1)
[media] v4l2-ioctl.c: check for valid tuner type in S_HW_FREQ_SEEK
[media] tuner-core: simplify the standard fixup
[media] tuner-core/v4l2-subdev: document that the type field has to be filled in
[media] v4l2-subdev.h: remove unused s_mode tuner op
[media] feature-removal-schedule: change in how radio device nodes are handled
[media] bttv: fix s_tuner for radio
[media] pvrusb2: fix g/s_tuner support
[media] v4l2-ioctl.c: prefill tuner type for g_frequency and g/s_tuner
[media] tuner-core: fix tuner_resume: use t->mode instead of t->type
[media] tuner-core: fix s_std and s_tuner
Diffstat (limited to 'mm/mlock.c')
0 files changed, 0 insertions, 0 deletions