Merge tag 'v3.0-rc7' into staging/for_v3.1

* tag 'v3.0-rc7': (1612 commits)
  Linux 3.0-rc7
  Documentation/Changes: remove some really obsolete text
  ath5k: Add missing breaks in switch/case
  Documentation/spinlocks.txt: Remove reference to sti()/cli()
  cifs: drop spinlock before calling cifs_put_tlink
  hp-wmi: fix use after free
  dell-laptop - using buffer without mutex_lock
  Revert: "dell-laptop: Toggle the unsupported hardware killswitch"
  PM: Reintroduce dropped call to check_wakeup_irqs
  [CPUFREQ] fix cpumask memory leak in acpi-cpufreq on cpu hotplug.
  hwmon: (pmbus) Improve auto-detection of temperature status register
  hwmon: (lm95241) Fix negative temperature results
  firewire: ohci: do not bind to Pinnacle cards, avert panic
  cifs: fix expand_dfs_referral
  cifs: move bdi_setup_and_register outside of CONFIG_CIFS_DFS_UPCALL
  ALSA: hda - Fix a copmile warning
  MAINTAINERS: update Bjorn Helgaas's email address
  drivers/leds/leds-pca9532.c: change driver name to be unique
  mm/nommu.c: fix remap_pfn_range()
  w1: ds1wm: add a reset recovery parameter
  ...

Conflicts:
	Documentation/feature-removal-schedule.txt

diff --cc Documentation/feature-removal-schedule.txt
index 2042ee6db22fd28ee3f882aa294fa6d8ad764601,b1c921c27519a0953591b6a64159e46856e7558d..8a988e5708bac75feead9e53731a6cb2fb83c5d6
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -601,37 -584,24 +584,59 @@@ Who:    Laurent Pinchart <laurent.pinchart
  
  ----------------------------
  
 +What: Support for driver specific ioctls in the pwc driver (everything
 +      defined in media/pwc-ioctl.h)
 +When: 3.3
 +Why:  This stems from the v4l1 era, with v4l2 everything can be done with
 +      standardized v4l2 API calls
 +Who:  Hans de Goede <hdegoede@redhat.com>
 +
 +----------------------------
 +
 +What: Driver specific sysfs API in the pwc driver
 +When: 3.3
 +Why:  Setting pan/tilt should be done with v4l2 controls, like with other
 +      cams. The button is available as a standard input device
 +Who:  Hans de Goede <hdegoede@redhat.com>
 +
 +----------------------------
 +
 +What: Driver specific use of pixfmt.priv in the pwc driver
 +When: 3.3
 +Why:  The .priv field never was intended for this, setting a framerate is
 +      support using the standardized S_PARM ioctl
 +Who:  Hans de Goede <hdegoede@redhat.com>
 +
 +----------------------------
 +
 +What: Software emulation of arbritary resolutions in the pwc driver
 +When: 3.3
 +Why:  The pwc driver claims to support any resolution between 160x120
 +      and 640x480, but emulates this by simply drawing a black border
 +      around the image. Userspace can draw its own black border if it
 +      really wants one.
 +Who:  Hans de Goede <hdegoede@redhat.com>
 +
 +----------------------------
++
+ What: For VIDIOC_S_FREQUENCY the type field must match the device node's type.
+       If not, return -EINVAL.
+ When: 3.2
+ Why:  It makes no sense to switch the tuner to radio mode by calling
+       VIDIOC_S_FREQUENCY on a video node, or to switch the tuner to tv mode by
+       calling VIDIOC_S_FREQUENCY on a radio node. This is the first step of a
+       move to more consistent handling of tv and radio tuners.
+ Who:  Hans Verkuil <hans.verkuil@cisco.com>
+ 
+ ----------------------------
+ 
+ What: Opening a radio device node will no longer automatically switch the
+       tuner mode from tv to radio.
+ When: 3.3
+ Why:  Just opening a V4L device should not change the state of the hardware
+       like that. It's very unexpected and against the V4L spec. Instead, you
+       switch to radio mode by calling VIDIOC_S_FREQUENCY. This is the second
+       and last step of the move to consistent handling of tv and radio tuners.
+ Who:  Hans Verkuil <hans.verkuil@cisco.com>
+ 
+ ----------------------------

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/cx23885/cx23885-cards.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