Commit c44dead7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (205 commits)
  USB: EHCI: Remove SPARC_LEON {read,write}_be definitions from ehci.h
  USB: UHCI: Support big endian GRUSBHC HC
  sparc: add {read,write}*_be routines
  USB: UHCI: Add support for big endian descriptors
  USB: UHCI: Use ACCESS_ONCE rather than using a full compiler barrier
  USB: UHCI: Add support for big endian mmio
  usb-storage: Correct adjust_quirks to include latest flags
  usb/isp1760: Fix possible unlink problems
  usb/isp1760: Move function isp1760_endpoint_disable() within file.
  USB: remove remaining usages of hcd->state from usbcore and fix regression
  usb: musb: ux500: add configuration and build options for ux500 dma
  usb: musb: ux500: add dma glue layer for ux500
  usb: musb: ux500: add dma name for ux500
  usb: musb: ux500: add ux500 specific code for gadget side
  usb: musb: fix compile error
  usb-storage: fix up the unusual_realtek device list
  USB: gadget: f_audio: Fix invalid dereference of initdata
  EHCI: don't rescan interrupt QHs needlessly
  OHCI: fix regression caused by nVidia shutdown workaround
  USB: OTG: msm: Free VCCCX regulator even if we can't set the voltage
  ...
parents 99dff585 d5f6db9e

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -2585,6 +2585,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					bytes of sense data);

				c = FIX_CAPACITY (decrease the reported

					device capacity by one sector);

				d = NO_READ_DISC_INFO (don't use

					READ_DISC_INFO command);

				e = NO_READ_CAPACITY_16 (don't use

					READ_CAPACITY_16 command);

				h = CAPACITY_HEURISTICS (decrease the

					reported device capacity by one

					sector if the number is odd);

Documentation/usb/callbacks.txt

+5 −3
Original line number Diff line number Diff line
@@ -95,9 +95,11 @@ pre_reset 


int (*pre_reset)(struct usb_interface *intf);



Another driver or user space is triggering a reset on the device which

contains the interface passed as an argument. Cease IO and save any

device state you need to restore.

A driver or user space is triggering a reset on the device which

contains the interface passed as an argument. Cease IO, wait for all

outstanding URBs to complete, and save any device state you need to

restore.  No more URBs may be submitted until the post_reset method

is called.



If you need to allocate memory here, use GFP_NOIO or GFP_ATOMIC, if you

are in atomic context.

Documentation/usb/linux-cdc-acm.inf

+2 −2
Original line number Diff line number Diff line
@@ -90,10 +90,10 @@ ServiceBinary=%12%\USBSER.sys 
[SourceDisksFiles]

[SourceDisksNames]

[DeviceList]

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02



[DeviceList.NTamd64]

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02





;------------------------------------------------------------------------------

Documentation/usb/linux.inf

+3 −3
Original line number Diff line number Diff line
@@ -18,15 +18,15 @@ DriverVer = 06/21/2006,6.0.6000.16384 


; Decoration for x86 architecture

[LinuxDevices.NTx86]

%LinuxDevice%       = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00

%LinuxDevice%       = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_1d6b&PID_0104&MI_00



; Decoration for x64 architecture

[LinuxDevices.NTamd64]

%LinuxDevice%       = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00

%LinuxDevice%       = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_1d6b&PID_0104&MI_00



; Decoration for ia64 architecture

[LinuxDevices.NTia64]

%LinuxDevice%       = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00

%LinuxDevice%       = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_1d6b&PID_0104&MI_00



;@@@ This is the common setting for setup

[ControlFlags]

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -4253,7 +4253,7 @@ F: include/linux/isicom.h 
MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER

M:	Felipe Balbi <balbi@ti.com>

L:	linux-usb@vger.kernel.org

T:	git git://gitorious.org/usb/usb.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git

S:	Maintained

F:	drivers/usb/musb/
@@ -4588,6 +4588,7 @@ M: Felipe Balbi <balbi@ti.com> 
M:	David Brownell <dbrownell@users.sourceforge.net>

L:	linux-usb@vger.kernel.org

L:	linux-omap@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git

S:	Maintained

F:	drivers/usb/*/*omap*

F:	arch/arm/*omap*/usb*

CRA Git | Maintained and supported by SUSTech CRA and CCSE