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
..
alps.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-05-05 07:53:18 -07:00
alps.h	Input: ALPS - add interleaved protocol support (Dell E6x00 series)	2009-12-15 22:15:25 -08:00
amimouse.c
appletouch.c	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00
atarimouse.c
bcm5974.c	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00
elantech.c	Input: elantech - relax signature checks	2010-05-19 10:15:13 -07:00
elantech.h	Input: elantech - use all 3 bytes when checking version	2010-05-13 00:43:19 -07:00
gpio_mouse.c	Input: gpio_mouse - use standard driver registration method	2009-07-07 22:47:14 -07:00
hgpk.c	Input: psmouse - small formatting changes to better follow coding style	2010-05-19 11:31:51 -07:00
hgpk.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
inport.c
Kconfig	Input: do not force selecting i8042 on Moorestown	2010-05-19 10:14:25 -07:00
lifebook.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
lifebook.h	Input: psmouse - do not carry DMI data around	2009-12-03 23:25:36 -08:00
logibm.c
logips2pp.c	Input: psmouse - small formatting changes to better follow coding style	2010-05-19 11:31:51 -07:00
logips2pp.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
Makefile	Input: add new driver for Sentelic Finger Sensing Pad	2009-08-19 21:46:09 -07:00
maplemouse.c	maple: input: fix up maple mouse driver	2009-04-27 09:22:31 +09:00
pc110pad.c	Input: pc110pad - remove unused variable dev	2009-04-15 09:04:03 -07:00
psmouse-base.c	Input: psmouse - small formatting changes to better follow coding style	2010-05-19 11:31:51 -07:00
psmouse.h	Input: psmouse - ignore parity error for basic protocols	2010-04-19 00:50:42 -07:00
pxa930_trkball.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
rpcmouse.c	[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h	2009-03-25 10:21:35 +00:00
sentelic.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
sentelic.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
sermouse.c
synaptics_i2c.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
synaptics.c	Input: psmouse - small formatting changes to better follow coding style	2010-05-19 11:31:51 -07:00
synaptics.h	Input: synaptics - set dimensions as reported by firmware	2010-05-19 10:15:29 -07:00
touchkit_ps2.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
touchkit_ps2.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
trackpoint.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
trackpoint.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
vsxxxaa.c	Input: vsxxxaa - change formatting style to match the rest of the kernel	2009-10-13 23:58:27 -07:00