David S. Miller bb803cfbec Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/scsi/fcoe/fcoe.c		2009-05-18 21:08:20 -07:00
..
Makefile	[SCSI] fcoe, libfc: add libfcoe module	2009-04-03 09:23:04 -05:00
fcoe.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-18 21:08:20 -07:00
fcoe.h	[SCSI] fcoe, libfcoe: Add support for FIP. FCoE discovery and keep-alive.	2009-04-03 09:23:08 -05:00
libfcoe.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-18 21:08:20 -07:00