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 |
| .. |
|
acpi
|
ACPICA: Update version to 20100428.
|
2010-05-06 03:05:54 -04:00 |
|
asm-generic
|
Merge branch 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
|
2010-05-18 09:17:01 -07:00 |
|
crypto
|
|
|
|
drm
|
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
|
2010-05-07 14:02:01 -07:00 |
|
keys
|
|
|
|
linux
|
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
|
2010-05-20 21:26:12 -07:00 |
|
math-emu
|
|
|
|
media
|
V4L/DVB: v4l2-subdev.h: Add support for enum_dv_preset
|
2010-05-19 12:59:01 -03:00 |
|
mtd
|
|
|
|
net
|
ipv6: Replace inet6_ifaddr->dead with state
|
2010-05-18 15:36:06 -07:00 |
|
pcmcia
|
pcmcia: remove unused mem_op.h
|
2010-05-10 10:23:20 +02:00 |
|
rdma
|
IB/core: Add support for masked atomic operations
|
2010-04-21 16:37:48 -07:00 |
|
rxrpc
|
|
|
|
scsi
|
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 |
|
sound
|
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
|
2010-05-20 09:41:44 -07:00 |
|
trace
|
Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
|
2010-05-18 08:35:04 -07:00 |
|
video
|
broadsheetfb: support storing waveform
|
2010-03-12 15:52:34 -08:00 |
|
xen
|
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 |
|
Kbuild
|
|
|