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

Conflicts:
	drivers/net/bnx2x/bnx2x.h

2011-03-03 21:27:42 -08:00

..

dcbevent.c

net_dcb: add application notifiers

2010-12-31 10:47:46 -08:00

dcbnl.c

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

2011-03-03 21:27:42 -08:00

Kconfig

DCB: fix kconfig option

2008-11-25 01:02:08 -08:00

Makefile

net_dcb: add application notifiers

2010-12-31 10:47:46 -08:00