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
..
88pm860x-ts.c
ad7877.c
ad7879.c
ads7846.c
atmel_tsadcc.c
atmel-wm97xx.c
da9034-ts.c
dynapro.c
eeti_ts.c
elo.c
fujitsu_ts.c
gunze.c
h3600_ts_input.c
hampshire.c
hp680_ts_input.c
htcpen.c
inexio.c
jornada720_ts.c
Kconfig
mainstone-wm97xx.c
Makefile
mc13783_ts.c
mcs5000_ts.c
migor_ts.c
mk712.c
mtouch.c
pcap_ts.c
penmount.c
s3c2410_ts.c
touchit213.c
touchright.c
touchwin.c
tsc2007.c
ucb1400_ts.c
usbtouchscreen.c
w90p910_ts.c
wacom_w8001.c
wm97xx-core.c
wm9705.c
wm9712.c
wm9713.c
zylonite-wm97xx.c