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
..
Kconfig	i2400m-sdio: select IWMC3200TOP in Kconfig	2009-10-19 23:22:51 -07:00
Makefile	…
control.c	drivers/net: remove useless semicolons	2010-05-17 22:47:34 -07:00
debug-levels.h	…
debugfs.c	wimax/i2400m: introduce i2400m_reset(), stopping TX and carrier	2009-11-03 12:49:36 -08:00
driver.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax	2010-05-15 23:14:16 -07:00
fw.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
i2400m-sdio.h	wimax/i2400m: fix the race condition for accessing TX queue	2010-05-11 14:04:46 -07:00
i2400m-usb.h	wimax/i2400m: Add support for more i6x50 SKUs	2010-01-21 16:49:24 -08:00
i2400m.h	wimax/i2400m: Move module params to other file so they can be static	2010-05-11 14:10:24 -07:00
netdev.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax	2010-05-15 23:14:16 -07:00
op-rfkill.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
rx.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax	2010-05-15 23:14:16 -07:00
sdio-debug-levels.h	…
sdio-fw.c	wimax/i2400m: be smarter about copying command buffer to bm_cmd_buf	2009-10-19 15:55:46 +09:00
sdio-rx.c	drivers/net: Remove unnecessary returns from void function()s	2010-05-14 00:19:28 -07:00
sdio-tx.c	wimax/i2400m: add the error recovery mechanism on TX path	2010-05-11 14:05:39 -07:00
sdio.c	wimax/i2400m: SDIO specific TX queue's minimum buffer room for new message	2010-05-11 14:08:58 -07:00
sysfs.c	…
tx.c	wimax/i2400m: reserve additional space in the TX queue's buffer while allocating space for a new message header	2010-05-11 14:08:50 -07:00
usb-debug-levels.h	…
usb-fw.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
usb-notif.c	drivers/net: Remove unnecessary returns from void function()s	2010-05-14 00:19:28 -07:00
usb-rx.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
usb-tx.c	wimax/i2400m: handle USB stalls	2009-11-03 12:49:40 -08:00
usb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00