Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
467429b475
linux/drivers/staging
History
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
..
arlan net: convert multicast list to list_head 2010-04-03 14:22:15 -07:00
asus_oled driver core: Convert some drivers to CLASS_ATTR_STRING 2010-03-07 17:04:48 -08:00
batman-adv 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
comedi drivers/staging/comedi: dev_node removal (quatech_daqp_cs) 2010-05-17 15:44:58 +02:00
crystalhd 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
cx25821 V4L/DVB: Fix unlock logic at medusa_video_init 2010-05-19 12:59:16 -03:00
dream 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
dt3155 Staging: dt3155: fix 50Hz configuration 2010-04-30 09:30:10 -07:00
echo
et131x Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
frontier staging: make USB device id constant 2010-03-03 16:42:42 -08:00
go7007 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
hv Staging: hv: name network device ethX rather than sethX 2010-04-30 09:30:10 -07:00
iio Staging: iio: fix up the iio_get_new_idr_val comment 2010-04-30 09:30:11 -07:00
line6 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
netwave pcmcia: remove unused mem_op.h 2010-05-10 10:23:20 +02:00
octeon STAGING: octeon-ethernet: Use proper phy addresses for Movidis hardware. 2010-04-30 20:52:53 +01:00
otus staging/otus: include slab.h from usbdrv.h 2010-04-05 11:23:16 +09:00
panel Staging: Cleanup useless headers 2010-03-03 16:43:05 -08:00
phison Staging: merge staging patches into Linus's main branch 2010-03-04 08:39:02 -08:00
poch 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
pohmelfs 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
quatech_usb2 staging: make USB device id constant 2010-03-03 16:42:42 -08:00
ramzswap 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
rar_register Staging: rar_register: add suspend and resume functions 2010-03-03 16:42:57 -08:00
rt2860 USB: staging: fix up usb_buffer_alloc calls in the staging tree 2010-05-20 13:21:38 -07:00
rt2870 Staging: rt{2860,2870}sta: Use request_firmware() to load firmware 2010-03-03 16:42:48 -08:00
rt3070 Staging: rt3070: md4.h: Checkpatch cleanup 2010-03-03 16:43:07 -08:00
rtl8187se 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
rtl8192e 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
rtl8192su Staging: add Add Sitecom WL-349 to rtl8192su 2010-04-30 09:30:11 -07:00
rtl8192u 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
samsung-laptop backlight: Allow properties to be passed at registration 2010-03-16 19:47:54 +00:00
sep 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
serqt_usb2 Staging: serqt_usb2: Two branches the same in qt_set_termios() 2010-03-03 16:42:48 -08:00
slicoss net: convert multicast list to list_head 2010-04-03 14:22:15 -07:00
sm7xx 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
strip 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
tm6000 V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers 2010-05-19 12:59:18 -03:00
udlfb USB: staging: fix up usb_buffer_alloc calls in the staging tree 2010-05-20 13:21:38 -07:00
usbip USB: remove URB_NO_SETUP_DMA_MAP 2010-05-20 13:21:40 -07:00
vme Staging: vme: Re-introduce necessary brackets 2010-04-30 09:30:11 -07:00
vt6655 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
vt6656 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
wavelan Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
winbond Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
wlags49_h2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
wlags49_h25
wlan-ng 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
Kconfig V4L/DVB: tm6000: Allow tm6000 driver compilation 2010-05-18 00:43:56 -03:00
Makefile V4L/DVB: tm6000: Allow tm6000 driver compilation 2010-05-18 00:43:56 -03:00
staging.c