5cc1035062
* 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. |
||
---|---|---|
.. | ||
fc | ||
fc_encode.h | ||
fc_frame.h | ||
iscsi_if.h | ||
iscsi_proto.h | ||
Kbuild | ||
libfc.h | ||
libfcoe.h | ||
libiscsi.h | ||
libiscsi_tcp.h | ||
libsas.h | ||
libsrp.h | ||
osd_attributes.h | ||
osd_initiator.h | ||
osd_protocol.h | ||
osd_sec.h | ||
osd_sense.h | ||
osd_types.h | ||
sas.h | ||
sas_ata.h | ||
scsi.h | ||
scsi_bsg_fc.h | ||
scsi_cmnd.h | ||
scsi_dbg.h | ||
scsi_device.h | ||
scsi_devinfo.h | ||
scsi_dh.h | ||
scsi_driver.h | ||
scsi_eh.h | ||
scsi_host.h | ||
scsi_ioctl.h | ||
scsi_netlink.h | ||
scsi_netlink_fc.h | ||
scsi_scan.h | ||
scsi_tcq.h | ||
scsi_tgt.h | ||
scsi_tgt_if.h | ||
scsi_transport.h | ||
scsi_transport_fc.h | ||
scsi_transport_iscsi.h | ||
scsi_transport_sas.h | ||
scsi_transport_spi.h | ||
scsi_transport_srp.h | ||
scsicam.h | ||
sg.h | ||
srp.h |