1
0
Fork 0
alistair23-linux/Documentation/usb
Linus Torvalds 7a9b149212 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: (229 commits)
  USB: remove unused usb_buffer_alloc and usb_buffer_free macros
  usb: musb: update gfp/slab.h includes
  USB: ftdi_sio: fix legacy SIO-device header
  USB: kl5usb105: reimplement using generic framework
  USB: kl5usb105: minor clean ups
  USB: kl5usb105: fix memory leak
  USB: io_ti: use kfifo to implement write buffering
  USB: io_ti: remove unsused private counter
  USB: ti_usb: use kfifo to implement write buffering
  USB: ir-usb: fix incorrect write-buffer length
  USB: aircable: fix incorrect write-buffer length
  USB: safe_serial: straighten out read processing
  USB: safe_serial: reimplement read using generic framework
  USB: safe_serial: reimplement write using generic framework
  usb-storage: always print quirks
  USB: usb-storage: trivial debug improvements
  USB: oti6858: use port write fifo
  USB: oti6858: use kfifo to implement write buffering
  USB: cypress_m8: use kfifo to implement write buffering
  USB: cypress_m8: remove unused drain define
  ...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
	drivers/input/tablet/acecad.c
	drivers/input/tablet/kbtab.c
	drivers/input/tablet/wacom_sys.c
	drivers/media/video/gspca/gspca.c
	sound/usb/usbaudio.c
2010-05-20 21:26:12 -07:00
..
CREDITS documentation: convert the Documentation directory to UTF-8 2007-05-09 08:58:19 +02:00
URB.txt Fix typos in Documentation/: 'S' 2006-10-03 22:55:17 +02:00
WUSB-Design-overview.txt Documentation/: it's -> its where appropriate 2010-04-23 02:09:52 +02:00
acm.txt USB: small update to Documentation/usb/acm.txt 2007-01-05 12:19:09 -08:00
anchors.txt trivial: Miscellaneous documentation typo fixes 2009-06-12 18:01:47 +02:00
authorization.txt USB: Fix sysfs paths in documentation 2009-09-23 06:46:41 -07:00
bulk-streams.txt USB: Support for allocating USB 3.0 streams. 2010-05-20 13:21:38 -07:00
callbacks.txt trivial: usb: fix missing space typo in doc 2009-06-12 18:01:51 +02:00
dma.txt USB: remove URB_NO_SETUP_DMA_MAP 2010-05-20 13:21:40 -07:00
ehci.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
error-codes.txt USB: check the endpoint type against the pipe type 2010-03-02 14:53:07 -08:00
gadget_hid.txt USB: gadget: add HID gadget driver 2010-05-20 13:21:35 -07:00
gadget_printer.txt USB: add Printer Gadget Driver 2008-02-01 14:34:49 -08:00
gadget_serial.txt USB: Documentation/usb/gadget_serial.txt: update to match driver use_acm behaviour 2008-12-17 10:49:13 -08:00
hiddev.txt Fix typos in /Documentation : Misc 2006-11-30 05:21:10 +01:00
hotplug.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
iuu_phoenix.txt USB: add iuu_phoenix driver 2008-02-01 14:34:47 -08:00
linux.inf Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
misc_usbsevseg.txt USB: Added driver for a Delcom USB 7-segment LED Display 2008-10-17 14:40:51 -07:00
mtouchusb.txt Fix typos in Documentation/: 'S' 2006-10-03 22:55:17 +02:00
ohci.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
persist.txt USB: use reset_resume when normal resume fails 2008-07-21 15:16:48 -07:00
power-management.txt USB: deprecate the power/level sysfs attribute 2010-05-20 13:21:37 -07:00
proc_usb_info.txt USB: fix comment about endianness of descriptors 2008-12-17 10:49:14 -08:00
rio.txt Fix typos in /Documentation : 'T'' 2006-11-30 04:55:36 +01:00
usb-help.txt USB:Update mailing list information in documentation 2008-03-10 16:42:27 -07:00
usb-serial.txt USB: usbserial: mos7720: add support for parallel port on moschip 7715 2010-05-20 13:21:39 -07:00
usbmon.txt USB: fix paths in usbmon documentation 2009-09-23 06:46:37 -07:00
wusb-cbaf uwb: add basic radio manager 2008-11-19 14:46:33 +00:00