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
..
iforce	Input: iforce - fix Guillemot Jet Leader 3D entry	2010-05-10 22:54:39 -07:00
a3d.c	Input: gameport - check return value of gameport_register_driver()	2008-07-30 00:41:36 -04:00
adi.c	Input: gameport - check return value of gameport_register_driver()	2008-07-30 00:41:36 -04:00
amijoy.c	Input: remove CVS keywords	2008-05-20 12:17:39 -04:00
analog.c	i8253: Convert i8253_lock to raw_spinlock	2010-03-02 10:28:38 +01:00
cobra.c	Input: gameport - check return value of gameport_register_driver()	2008-07-30 00:41:36 -04:00
db9.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
gamecon.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
gf2k.c	Input: gf2k - fix &&/|| confusion in gf2k_connect()	2010-01-01 18:45:52 -08:00
grip_mp.c	Input: gameport - check return value of gameport_register_driver()	2008-07-30 00:41:36 -04:00
grip.c	Input: gameport - check return value of gameport_register_driver()	2008-07-30 00:41:36 -04:00
guillemot.c	Input: gameport - check return value of gameport_register_driver()	2008-07-30 00:41:36 -04:00
interact.c	Input: gameport - check return value of gameport_register_driver()	2008-07-30 00:41:36 -04:00
joydump.c	Input: gameport - check return value of gameport_register_driver()	2008-07-30 00:41:36 -04:00
Kconfig	Input: gamecon - add rumble support for N64 pads	2010-02-21 22:09:43 -08:00
magellan.c	Input: remove CVS keywords	2008-05-20 12:17:39 -04:00
Makefile	Input: add support for Maple controller as a joystick	2008-12-30 00:58:05 -08:00
maplecontrol.c	sh: maple: Support block reads and writes.	2009-02-27 16:07:32 +09:00
sidewinder.c	Input: gameport - check return value of gameport_register_driver()	2008-07-30 00:41:36 -04:00
spaceball.c	Input: remove CVS keywords	2008-05-20 12:17:39 -04:00
spaceorb.c	Input: remove CVS keywords	2008-05-20 12:17:39 -04:00
stinger.c	Input: remove CVS keywords	2008-05-20 12:17:39 -04:00
tmdc.c	Input: gameport - check return value of gameport_register_driver()	2008-07-30 00:41:36 -04:00
turbografx.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
twidjoy.c	Input: remove CVS keywords	2008-05-20 12:17:39 -04:00
walkera0701.c	Input: add joystick driver for Walkera WK-0701 RC transmitter	2008-11-19 16:55:40 -05:00
warrior.c	Input: remove CVS keywords	2008-05-20 12:17:39 -04:00
xpad.c	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00
zhenhua.c	Input: add Zhen Hua driver	2008-04-15 13:26:52 -04:00