aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/scsicam.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-11 10:13:01 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-11 10:13:01 -0700
commitae292dbd2e9385d4c63f0c7099ab73b60d1b26d3 (patch)
tree58b9b1524f71d3d7709ce5f971dc88805d8f80ef /drivers/scsi/scsicam.c
parentaf5b14c49aad13de1c8e9e1abfbabe127c3af92e (diff)
parent03fc370bdc1b31f3d09bd88d65bc50c03f450a9d (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: drivers/usb/serial/bus.c: Fix incompatible pointer type warning USB: another quirky device (LCD display) USB: fix serial gadget ACM breakage USB: More USB_QUIRK_RESET_RESUME devices USB Mass Storage: limit "Rockchip ROCK MP3" device (071b:3203) max I/O to 64 sectors per command USB: Nikon D40 Quirks USB: Add Sony Ericsson P1i to unusual_devs.h USB: option: Add Dell HSDPA 5520 to driver USB: option: Add a new device ID for the HUAWEI E220 HSDPA modem. USB: fix linked list insertion bugfix for usb core USB: quirky flash drive USB: prevent Genesys USB-IDE from autosuspending USB: prevent Thomson card reader from autosuspending USB: Add iPhone device id to the quirk list. USB: ftdi_sio: add of a new product/manufacturer, TML usb/misc/sisusbvga: add product ID of TARGUS/MCT device USB: oti6858: Remove broken ioctl code in -mm tree and also the broken fixes
Diffstat (limited to 'drivers/scsi/scsicam.c')
0 files changed, 0 insertions, 0 deletions