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
..
dvb	V4L/DVB (13164): DocBook/dvb: Starts documenting DVBS2API ioctls	2009-12-05 18:40:40 -02:00
v4l	V4L/DVB: Documentation: fix small error in the ENUMINPUT doc	2010-05-19 12:58:53 -03:00
.gitignore	documentation: ignore byproducts from latex	2009-04-02 19:04:53 -07:00
alsa-driver-api.tmpl	ALSA: Move ALSA docbooks to be with the rest of the kernel docbooks	2009-03-09 15:22:59 +01:00
debugobjects.tmpl	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
device-drivers.tmpl	docbook: fix errors from x86 headers merger	2010-03-03 07:32:39 -08:00
deviceiobook.tmpl	docbook: fix errors from x86 headers merger	2010-03-03 07:32:39 -08:00
filesystems.tmpl	docbook: move pipe and splice to filesystems docbook	2008-02-13 16:21:19 -08:00
gadget.tmpl	usb gadget: cdc obex glue	2008-10-17 14:40:53 -07:00
genericirq.tmpl	doc: Fix IRQ chip docs	2009-12-04 15:39:57 +01:00
kernel-api.tmpl	docbooks: add/fix PCI kernel-doc	2009-04-22 14:49:33 -07:00
kernel-hacking.tmpl	docbook: fix signal_pending() argument	2009-12-09 18:59:52 -08:00
kernel-locking.tmpl	Remove mention of semaphores from kernel-locking	2008-07-24 08:29:40 -04:00
kgdb.tmpl	kgdb: gdb documentation fix	2009-05-15 07:56:25 -05:00
libata.tmpl	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2010-05-20 09:27:37 -07:00
librs.tmpl	docbook: librs typo fixes	2007-05-08 11:15:15 -07:00
lsm.tmpl	Add missing section ID to lsm.tmpl	2008-02-07 08:42:16 -08:00
mac80211.tmpl	mac80211: remove get_tx_stats() driver op	2010-02-08 16:51:01 -05:00
Makefile	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2009-12-16 10:09:16 -08:00
mcabook.tmpl	Rationalise Randy's address a bit	2008-10-30 11:38:47 -07:00
media-entities.tmpl	V4L/DVB: v4l spec: document new events	2010-05-19 12:58:10 -03:00
media-indices.tmpl	V4L/DVB (13572): v4l2-spec: Digital Video Timings API documentation	2009-12-16 00:18:04 -02:00
media.tmpl	DocBook/media: renamed xml documents to tmpl	2009-09-19 00:14:14 -03:00
mtdnand.tmpl	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
networking.tmpl	wimax: Makefile, Kconfig and docbook linkage for the stack	2009-01-07 10:00:17 -08:00
rapidio.tmpl	docbook: fix fatal rapidio yet again (and more to come)	2008-04-29 20:40:00 -07:00
regulator.tmpl	regulator: Add basic DocBook manual	2009-01-08 20:10:34 +00:00
s390-drivers.tmpl	docbook: fix s390 fatal error after header files moved	2008-08-05 16:56:29 -07:00
scsi.tmpl	trivial: fix typos "man[ae]g?ment" -> "management"	2009-09-21 15:14:56 +02:00
sh.tmpl	sh: fixup the docbook paths for clock framework shuffling.	2010-05-13 18:42:25 +09:00
stylesheet.xsl	DocBook: Don't use graphics callouts	2009-09-19 00:14:17 -03:00
tracepoint.tmpl	Add DocBook documentation for the block tracepoints.	2010-03-09 09:26:04 +01:00
uio-howto.tmpl	uio: add generic driver for PCI 2.3 devices	2009-09-15 09:50:48 -07:00
usb.tmpl	USB: remove usb DocBook warnings	2007-05-22 23:45:48 -07:00
writing_usb_driver.tmpl	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00
writing-an-alsa-driver.tmpl	ALSA: Update the documentation for changes of proc files	2010-04-13 12:55:09 +02:00
z8530book.tmpl	Rationalise Randy's address a bit	2008-10-30 11:38:47 -07:00