Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (47 commits)
  usb: musb: pass configuration specifics via pdata
  usb: musb: fix hanging when rmmod gadget driver
  USB: Add MUSB and TUSB support
  USB: serial: remove CONFIG_USB_DEBUG from sierra and option drivers
  USB: Add vendor/product id of ZTE MF628 to option
  USB: quirk PLL power down mode
  USB: omap_udc: fix compilation with debug enabled
  usb: cdc-acm: drain writes on close
  usb: cdc-acm: stop dropping tx buffers
  usb: cdc-acm: bugfix release()
  usb gadget: issue notifications from ACM function
  usb gadget: remove needless struct members
  USB: sh: r8a66597-hcd: fix disconnect regression
  USB: isp1301: fix compilation
  USB: fix compiler warning fix
  usb-storage: unusual_devs entry for Nokia 5300
  USB: cdc-acm.c: Fix compile warnings
  USB: BandRich BandLuxe C150/C250 HSPA Data Card Driver
  USB: ftdi_sio: add support for PHI Fisco data cable (FT232BM based, VID/PID 0403:e40b)
  usb: isp1760: don't be noisy about short packets.
  ...
parents 9921b256 ca6d1b13

Documentation/devices.txt

+0 −3
Original line number Original line Diff line number Diff line
@@ -2560,9 +2560,6 @@ Your cooperation is appreciated. 
		 96 = /dev/usb/hiddev0	1st USB HID device

		 96 = /dev/usb/hiddev0	1st USB HID device

		    ...

		    ...

		111 = /dev/usb/hiddev15	16th USB HID device

		111 = /dev/usb/hiddev15	16th USB HID device

		112 = /dev/usb/auer0	1st auerswald ISDN device

		    ...

		127 = /dev/usb/auer15	16th auerswald ISDN device

		128 = /dev/usb/brlvgr0	First Braille Voyager device

		128 = /dev/usb/brlvgr0	First Braille Voyager device

		    ...

		    ...

		131 = /dev/usb/brlvgr3	Fourth Braille Voyager device

		131 = /dev/usb/brlvgr3	Fourth Braille Voyager device

Documentation/ioctl-number.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -105,7 +105,6 @@ Code Seq# Include File Comments 
'T'	all	linux/soundcard.h	conflict!

'T'	all	linux/soundcard.h	conflict!

'T'	all	asm-i386/ioctls.h	conflict!

'T'	all	asm-i386/ioctls.h	conflict!

'U'	00-EF	linux/drivers/usb/usb.h

'U'	00-EF	linux/drivers/usb/usb.h

'U'	F0-FF	drivers/usb/auerswald.c

'V'	all	linux/vt.h

'V'	all	linux/vt.h

'W'	00-1F	linux/watchdog.h	conflict!

'W'	00-1F	linux/watchdog.h	conflict!

'W'	00-1F	linux/wanrouter.h	conflict!

'W'	00-1F	linux/wanrouter.h	conflict!

Documentation/usb/auerswald.txt

deleted100644 → 0
+0 −30
Original line number Original line Diff line number Diff line 
		Auerswald USB kernel driver

		===========================



What is it? What can I do with it?

==================================

The auerswald USB kernel driver connects your linux 2.4.x

system to the auerswald usb-enabled devices.



There are two types of auerswald usb devices:

a) small PBX systems (ISDN)

b) COMfort system telephones (ISDN)



The driver installation creates the devices

/dev/usb/auer0..15. These devices carry a vendor-

specific protocol. You may run all auerswald java

software on it. The java software needs a native

library "libAuerUsbJNINative.so" installed on

your system. This library is available from

auerswald and shipped as part of the java software.



You may create the devices with:

	mknod -m 666 /dev/usb/auer0 c 180 112

	...

	mknod -m 666 /dev/usb/auer15 c 180 127



Future plans

============

- Connection to ISDN4LINUX (the hisax interface)



The maintainer of this driver is wolfgang@iksw-muees.de

Documentation/usb/power-management.txt

+6 −1
Original line number Original line Diff line number Diff line
@@ -436,7 +436,12 @@ post_reset; the USB core guarantees that this is true of internal 
suspend/resume events as well.

suspend/resume events as well.





If a driver wants to block all suspend/resume calls during some

If a driver wants to block all suspend/resume calls during some

critical section, it can simply acquire udev->pm_mutex.

critical section, it can simply acquire udev->pm_mutex. Note that

calls to resume may be triggered indirectly. Block IO due to memory

allocations can make the vm subsystem resume a device. Thus while

holding this lock you must not allocate memory with GFP_KERNEL or

GFP_NOFS.



Alternatively, if the critical section might call some of the

Alternatively, if the critical section might call some of the

usb_autopm_* routines, the driver can avoid deadlock by doing:

usb_autopm_* routines, the driver can avoid deadlock by doing:

MAINTAINERS

+6 −6
Original line number Original line Diff line number Diff line
@@ -2928,6 +2928,12 @@ M: jirislaby@gmail.com 
L:	linux-kernel@vger.kernel.org

L:	linux-kernel@vger.kernel.org

S:	Maintained

S:	Maintained





MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER

P:     Felipe Balbi

M:     felipe.balbi@nokia.com

L:     linux-usb@vger.kernel.org

S:     Maintained



MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)

MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)

P:	Andrew Gallatin

P:	Andrew Gallatin

M:	gallatin@myri.com

M:	gallatin@myri.com
@@ -4196,12 +4202,6 @@ M: oliver@neukum.name 
L:	linux-usb@vger.kernel.org

L:	linux-usb@vger.kernel.org

S:	Maintained

S:	Maintained





USB AUERSWALD DRIVER

P:	Wolfgang Muees

M:	wolfgang@iksw-muees.de

L:      linux-usb@vger.kernel.org

S:	Maintained



USB BLOCK DRIVER (UB ub)

USB BLOCK DRIVER (UB ub)

P:	Pete Zaitcev

P:	Pete Zaitcev

M:	zaitcev@redhat.com

M:	zaitcev@redhat.com