Merge /home/v4l/v4l/for_upstream

* /home/v4l/v4l/for_upstream:
  [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

diff --cc drivers/media/video/bt8xx/bttv-driver.c
Simple merge

diff --cc drivers/media/video/cx18/cx18-ioctl.c
Simple merge

diff --cc drivers/media/video/ivtv/ivtv-ioctl.c
Simple merge

diff --cc drivers/media/video/tuner-core.c
Simple merge

diff --cc drivers/media/video/v4l2-ioctl.c
Simple merge

diff --cc include/media/v4l2-subdev.h
Simple merge