From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Jul 2011 06:08:32 +0000 (-0700)
Subject: Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
X-Git-Tag: v3.1-rc1~234
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f549953c15deab4c54708b39af86d4edecc6cddc;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'usb-next' of git://git./linux/kernel/git/gregkh/usb-2.6

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (115 commits)
  EHCI: fix direction handling for interrupt data toggles
  USB: serial: add IDs for WinChipHead USB->RS232 adapter
  USB: OHCI: fix another regression for NVIDIA controllers
  usb: gadget: m66592-udc: add pullup function
  usb: gadget: m66592-udc: add function for external controller
  usb: gadget: r8a66597-udc: add pullup function
  usb: renesas_usbhs: support multi driver
  usb: renesas_usbhs: inaccessible pipe is not an error
  usb: renesas_usbhs: care buff alignment when dma handler
  USB: PL2303: correctly handle baudrates above 115200
  usb: r8a66597-hcd: fixup USB_PORT_STAT_C_SUSPEND shift
  usb: renesas_usbhs: compile/config are rescued
  usb: renesas_usbhs: fixup comment-out
  usb: update email address in ohci-sh and r8a66597-hcd
  usb: r8a66597-hcd: add function for external controller
  EHCI: only power off port if over-current is active
  USB: mon: Allow to use usbmon without debugfs
  USB: EHCI: go back to using the system clock for QH unlinks
  ehci: add pci quirk for Ordissimo and RM Slate 100 too
  ehci: refactor pci quirk to use standard dmi_check_system method
  ...

Fix up trivial conflicts in Documentation/feature-removal-schedule.txt
---

f549953c15deab4c54708b39af86d4edecc6cddc
diff --cc Documentation/feature-removal-schedule.txt
index aca4f82,21f331d..9becc5e
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -548,24 -601,9 +548,31 @@@ Who:	Laurent Pinchart <laurent.pinchart
  
  ----------------------------
  
 +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>
+ 
+ ----------------------------