OpenCloudOS-Kernel/net/dcb
David S. Miller e5f2ef7ab4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c

Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-03-12 05:52:22 -04: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
dcbevent.c dcb: fix sparse warnings 2013-03-09 16:09:18 -05:00
dcbnl.c dcbnl: fix various netlink info leaks 2013-03-10 05:19:26 -04:00