David S. Miller 1c01a80cfe Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/smsc911x.c

2011-04-11 13:44:25 -07:00

..

Makefile

vxge: Update copyright information

2010-07-15 20:46:22 -07:00

vxge-config.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

vxge-config.h

vxge: MSIX one shot mode

2011-01-19 23:18:14 -08:00

vxge-ethtool.c

vxge: convert to set_phys_id

2011-04-06 14:35:20 -07:00

vxge-ethtool.h

vxge: Update copyright information

2010-07-15 20:46:22 -07:00

vxge-main.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

vxge-main.h

vxge: MSIX one shot mode

2011-01-19 23:18:14 -08:00

vxge-reg.h

vxge: correct multi-function detection

2010-11-11 09:30:23 -08:00

vxge-traffic.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

vxge-traffic.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

vxge-version.h

vxge: update driver version

2011-01-19 23:18:14 -08:00