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

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	net/llc/af_llc.c

2010-12-08 13:47:38 -08:00

..

adapter.h

cxgb4vf: minor comment/symbolic name cleanup.

2010-11-15 09:17:36 -08:00

cxgb4vf_main.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-08 13:47:38 -08:00

Makefile

cxgb4vf: Add new Makefile for T4 PCI-E SR-IOV Virtual Function driver cxgb4vf

2010-06-28 23:59:37 -07:00

sge.c

cxgb4vf: minor comment/symbolic name cleanup.

2010-11-15 09:17:36 -08:00

t4vf_common.h

cxgb4vf: add call to Firmware to reset VF State.

2010-11-12 12:31:01 -08:00

t4vf_defs.h

…

t4vf_hw.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-08 13:47:38 -08:00