David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: arch/microblaze/include/asm/socket.h		2009-08-12 17:44:53 -07:00
..
defines.h
ethtool.c
igbvf.h
Makefile
mbx.c
mbx.h
netdev.c	igbvf: return PCI_ERS_RESULT_DISCONNECT on permanent failure	2009-08-01 23:11:54 -07:00
regs.h
vf.c	igbvf: Allow VF driver to correctly recognize failure to set mac	2009-08-04 11:46:41 -07:00
vf.h