AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
2e54a00762
kernel_optimize_test/drivers/message/fusion
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
..
lsi [SCSI] fusion : mpi header update 2006-06-28 12:40:18 -04:00
Kconfig [SCSI] mptfusion: misc fix's 2006-07-13 09:32:09 -04:00
linux_compat.h [SCSI] drivers/message/fusion/linux_compat.h Removal of old code 2006-09-26 11:35:20 -07:00
Makefile [SCSI] mptfusion: misc fix's 2006-07-13 09:32:09 -04:00
mptbase.c Fix typos in doc and comments 2006-11-30 05:32:19 +01:00
mptbase.h [SCSI] mptfc: stall eh handlers if resetting while rport blocked 2006-10-25 15:12:21 -07:00
mptctl.c [SCSI] mptfusion: misc fix's 2006-07-13 09:32:09 -04:00
mptctl.h [SCSI] mptfusion: misc fix's 2006-07-13 09:32:09 -04:00
mptfc.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
mptlan.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
mptlan.h [PATCH] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason 2005-11-09 07:55:57 -08:00
mptsas.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
mptscsih.c [SCSI] mptfusion: task abort fix's 2006-07-13 09:30:49 -04:00
mptscsih.h [SCSI] fusion - exposing raid components in mptsas 2006-03-14 14:35:01 -06:00
mptspi.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00