Merge remote-tracking branch 'drivers-x86/linux-next'

Conflicts:
	Documentation/feature-removal-schedule.txt

diff --cc Documentation/feature-removal-schedule.txt
index ea0bace0124ad7db95b43f3e8f30c872584bc66b,c4c9e13f1b745de0fbcdfec822542044ff47fc62..fd19c14c45e3dae2dc69441545e53ec9993180fe
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -527,66 -584,15 +527,79 @@@ 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>
 +
 +----------------------------
 +
 +What: g_file_storage driver
 +When: 3.8
 +Why:  This driver has been superseded by g_mass_storage.
 +Who:  Alan Stern <stern@rowland.harvard.edu>
 +
 +----------------------------
++
+ What:   threeg and interface sysfs files in /sys/devices/platform/acer-wmi
+ When:   2012
+ Why:    In 2.6.40, we can now autodetect internal 3G device and already have
+       the threeg rfkill device. So, we plan to remove threeg sysfs support
+       for it's no longer necessary.
+ 
+       We also plan to remove interface sysfs file that exposed which ACPI-WMI
+       interface that was used by acer-wmi driver. It will replaced by
+       information log when acer-wmi initial.
+ Who:    Lee, Chun-Yi <jlee@novell.com>
+ 
+ ----------------------------

diff --cc drivers/platform/x86/asus-wmi.c
Simple merge

diff --cc include/linux/input.h
Simple merge