include/net/neighbour.h · 0ab03c2b1478f2438d2c80204f7fef65b1bca9cf · jan.koester / Linux · GitLab

Nov 19, 2010
24912420
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 24912420
David S. Miller authored Nov 19, 2010
```
Conflicts:
	drivers/net/bonding/bond_main.c
	net/core/net-sysfs.c
	net/ipv6/addrconf.c
```
24912420
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller authored Nov 19, 2010
```
Conflicts:
	drivers/net/bonding/bond_main.c
	net/core/net-sysfs.c
	net/ipv6/addrconf.c
```