android_kernel_xiaomi_sm8350/drivers/scsi/libsas
David Howells 4796b71fbb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	drivers/pcmcia/ds.c

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

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-06 15:01:18 +00:00
..
Kconfig
Makefile
sas_discover.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
sas_dump.c
sas_dump.h
sas_event.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
sas_expander.c [SCSI] libsas: better error handling in sas_expander.c 2006-12-03 12:29:46 -06:00
sas_init.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-06 15:01:18 +00:00
sas_internal.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
sas_phy.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
sas_port.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
sas_scsi_host.c [PATCH] aic94xx: handle REQ_DEVICE_RESET 2006-11-22 11:05:59 -06:00