net/ipv6/ndisc.c · be01d655d9b07c1350b19bf3d80eae0059254b4b · jan.koester / Linux · GitLab

Mar 27, 2008
8e8e4384
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 8e8e4384
David S. Miller authored Mar 27, 2008
```
Conflicts:

	drivers/net/usb/rndis_host.c
	drivers/net/wireless/b43/dma.c
	net/ipv6/ndisc.c
```
8e8e4384
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller authored Mar 27, 2008
```
Conflicts:

	drivers/net/usb/rndis_host.c
	drivers/net/wireless/b43/dma.c
	net/ipv6/ndisc.c
```