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 |
| .. |
|
acecad.c
|
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
|
2010-05-20 21:26:12 -07:00 |
|
aiptek.c
|
USB: rename usb_buffer_alloc() and usb_buffer_free() users
|
2010-05-20 13:21:38 -07:00 |
|
gtco.c
|
USB: rename usb_buffer_alloc() and usb_buffer_free() users
|
2010-05-20 13:21:38 -07:00 |
|
kbtab.c
|
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
|
2010-05-20 21:26:12 -07:00 |
|
Kconfig
|
Input: aiptek - add support for Genius G-PEN 560 tablet
|
2008-04-15 13:13:10 -04:00 |
|
Makefile
|
Input: move USB tablets under drivers/input/tablet
|
2007-05-08 01:41:29 -04:00 |
|
wacom.h
|
Input: wacom - use get_unaligned to access unaligned data
|
2010-04-13 23:24:42 -07:00 |
|
wacom_sys.c
|
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
|
2010-05-20 21:26:12 -07:00 |
|
wacom_wac.c
|
Input: wacom - streamline 2-finger touch support
|
2010-04-13 23:24:56 -07:00 |
|
wacom_wac.h
|
Input: wacom - streamline 2-finger touch support
|
2010-04-13 23:24:56 -07:00 |