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

Conflicts:

	drivers/net/hp-plus.c
	drivers/net/wireless/ath5k/base.c
	drivers/net/wireless/ath9k/recv.c
	net/wireless/reg.c

2008-11-26 23:48:40 -08:00

..

common.h

annotate chelsio

2008-01-28 15:10:29 -08:00

cphy.h

…

cpl5_cmd.h

…

cxgb2.c

netdev: add more functions to netdevice ops

2008-11-20 20:14:53 -08:00

elmer0.h

…

espi.c

drivers/net/chelsio/: #if 0 unused functions

2008-01-28 15:03:59 -08:00

espi.h

drivers/net/chelsio/: #if 0 unused functions

2008-01-28 15:03:59 -08:00

fpga_defs.h

…

gmac.h

…

Makefile

…

mv88e1xxx.c

…

mv88e1xxx.h

…

mv88x201x.c

…

my3126.c

…

pm3393.c

…

regs.h

…

sge.c

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

2008-11-26 23:48:40 -08:00

sge.h

drivers/net/chelsio/: #if 0 unused functions

2008-01-28 15:03:59 -08:00

subr.c

annotate chelsio

2008-01-28 15:10:29 -08:00

suni1x10gexp_regs.h

…

tp.c

…

tp.h

…

vsc7326_reg.h

…

vsc7326.c

…