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

Conflicts:
	drivers/net/virtio_net.c

2009-03-20 02:27:41 -07:00

..

bond_3ad.c

802.3ad: use standard ethhdr instead of ad_header

2008-12-26 13:41:53 -08:00

bond_3ad.h

net: replace uses of __constant_{endian}

2009-02-01 00:45:17 -08:00

bond_alb.c

drivers/net/bonding: fix sparse warnings: context imbalance

2009-02-17 17:26:08 -08:00

bond_alb.h

Convert bonding timers to workqueues

2007-10-23 20:32:00 -04:00

bond_ipv6.c

bonding: use pr_debug instead of own macros

2008-12-09 23:09:22 -08:00

bond_main.c

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

2009-03-20 02:27:41 -07:00

bond_sysfs.c

drivers/net/bonding: fix sparse warnings: move decls to header file

2008-12-25 23:58:57 -08:00

bonding.h

drivers/net/bonding: fix sparse warnings: move decls to header file

2008-12-25 23:58:57 -08:00

Makefile

bonding: send IPv6 neighbor advertisement on failover

2008-11-06 00:49:37 -05:00