Linus Torvalds 5cc1035062 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: (141 commits) USB: mct_u232: fix broken close USB: gadget: amd5536udc.c: fix error path USB: imx21-hcd - fix off by one resource size calculation usb: gadget: fix Kconfig warning usb: r8a66597-udc: Add processing when USB was removed. mxc_udc: add workaround for ENGcm09152 for i.MX35 USB: ftdi_sio: add device ids for ScienceScope USB: musb: AM35x: Workaround for fifo read issue USB: musb: add musb support for AM35x USB: AM35x: Add musb support usb: Fix linker errors with CONFIG_PM=n USB: ohci-sh - use resource_size instead of defining its own resource_len macro USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro USB: xhci: Fix compile error when CONFIG_PM=n USB: accept some invalid ep0-maxpacket values USB: xHCI: PCI power management implementation USB: xHCI: bus power management implementation USB: xHCI: port remote wakeup implementation USB: xHCI: port power management implementation ... Manually fix up (non-data) conflict: the SCSI merge gad renamed the 'hw_sector_size' member to 'physical_block_size', and the USB tree brought a new use of it.		2010-10-22 20:30:48 -07:00
..
fc	[SCSI] libfcoe: add protocol description of FIP VN2VN mode	2010-07-28 09:05:55 -05:00
fc_encode.h	[SCSI] libfc: add fc_fill_reply_hdr() and fc_fill_hdr()	2010-07-28 09:06:00 -05:00
fc_frame.h	[SCSI] libfc: add fc_frame_sid() and fc_frame_did() functions	2010-07-28 09:05:59 -05:00
iscsi_if.h	[SCSI] iscsi_transport: added new iscsi_param to display target alias in sysfs	2010-07-28 09:05:25 -05:00
iscsi_proto.h
Kbuild	[SCSI] Unexport scsi/scsi.h from headers_install	2010-05-02 11:45:12 -04:00
libfc.h	[SCSI] libfc: don't require a local exchange for incoming requests	2010-07-28 09:06:02 -05:00
libfcoe.h	[SCSI] libfcoe: fcoe: fnic: add FIP VN2VN point-to-multipoint support	2010-07-28 09:05:56 -05:00
libiscsi_tcp.h
libiscsi.h	[SCSI] libiscsi: Make iscsi_eh_target_reset start with session reset	2010-03-03 17:39:04 +05:30
libsas.h	[SCSI] libsas: Don't issue commands to devices that have been hot-removed	2010-10-08 16:03:42 -05:00
libsrp.h
osd_attributes.h
osd_initiator.h
osd_protocol.h
osd_sec.h
osd_sense.h
osd_types.h
sas_ata.h
sas.h
scsi_bsg_fc.h
scsi_cmnd.h
scsi_dbg.h
scsi_device.h	scsi/sd: add a no_read_capacity_16 scsi_device flag	2010-10-22 10:22:05 -07:00
scsi_devinfo.h
scsi_dh.h
scsi_driver.h
scsi_eh.h
scsi_host.h	block/scsi: Provide a limit on the number of integrity segments	2010-09-10 20:50:10 +02:00
scsi_ioctl.h
scsi_netlink_fc.h
scsi_netlink.h	scsi: use __uX types for headers exported to user space	2010-08-11 08:59:01 -07:00
scsi_scan.h
scsi_tcq.h	block: remove spurious uses of REQ_HARDBARRIER	2010-09-10 12:35:36 +02:00
scsi_tgt_if.h
scsi_tgt.h
scsi_transport_fc.h	[SCSI] fc class: add fc host dev loss sysfs file	2010-10-07 17:09:44 -05:00
scsi_transport_iscsi.h	[SCSI] iscsi_transport: wait on session in error handler path	2010-07-28 09:06:06 -05:00
scsi_transport_sas.h
scsi_transport_spi.h
scsi_transport_srp.h
scsi_transport.h
scsi.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-10-22 20:30:48 -07:00
scsicam.h
sg.h	sysctl extern cleanup: sg	2010-03-12 15:53:10 -08:00
srp.h