Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/include/scsi
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
iscsi_if.h [SCSI] iscsi: add async notification of session events 2006-06-29 11:14:42 -04:00
iscsi_proto.h [SCSI] iscsi: update version 2006-05-20 09:36:38 -05:00
Kbuild [HEADERS] One line per header in Kbuild files to reduce conflicts 2006-09-19 12:43:58 +01:00
libiscsi.h [SCSI] libiscsi: fix oops in connection create failure path 2006-10-25 15:13:53 -07:00
libsas.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
sas.h [SCSI] aci94xx: implement link rate setting 2006-09-07 15:20:23 -05:00
scsi.h [SCSI] replace u8 and u32 with __u8 and __u32 in scsi.h for user space 2006-10-25 15:14:34 -07:00
scsi_cmnd.h [SCSI] remove SCSI_STATE_ #defines 2006-08-06 11:35:39 -05:00
scsi_dbg.h [SCSI] remove scsi_request infrastructure 2006-06-10 16:24:40 -05:00
scsi_device.h [PATCH] scsi: device_reprobe() can fail 2006-09-30 19:33:43 -07:00
scsi_devinfo.h Merge ../scsi-rc-fixes-2.6 2006-04-14 15:47:45 -05:00
scsi_driver.h [BLOCK] update SCSI to use new blk_ordered for barriers 2006-01-06 09:52:55 +01:00
scsi_eh.h [SCSI] remove scsi_request infrastructure 2006-06-10 16:24:40 -05:00
scsi_host.h [SCSI] add shared tag map helpers 2006-08-31 11:18:03 -04:00
scsi_ioctl.h [SCSI] unify SCSI_IOCTL_SEND_COMMAND implementations 2006-04-13 10:13:15 -05:00
scsi_netlink.h [SCSI] SCSI & FC transport: extend event vendor id's to 64bits 2006-09-02 15:35:15 -05:00
scsi_netlink_fc.h [SCSI] SCSI & FC transport: extend event vendor id's to 64bits 2006-09-02 15:35:15 -05:00
scsi_tcq.h [PATCH] helper function for retrieving scsi_cmd given host based block layer tag 2006-10-04 19:32:09 +02:00
scsi_transport.h [PATCH] move ->eh_strategy_handler to the transport class 2006-04-10 14:15:47 -04:00
scsi_transport_fc.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
scsi_transport_iscsi.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
scsi_transport_sas.h [SCSI] scsi_transport_sas: make minimum and maximum linkrate settable quantities 2006-09-07 15:16:44 -05:00
scsi_transport_spi.h [SCSI] SPI transport class: misc DV fixes 2006-09-23 20:53:53 -05:00
scsicam.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sg.h [SCSI] sg: fixes for large page_size 2006-09-26 09:23:15 -07:00
srp.h [SCSI] srp.h: Add I/O Class values 2006-06-17 20:37:38 -07:00