-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6David S. Miller authored
Conflicts: drivers/net/usb/rndis_host.c drivers/net/wireless/b43/dma.c net/ipv6/ndisc.c
8e8e4384
Conflicts: drivers/net/usb/rndis_host.c drivers/net/wireless/b43/dma.c net/ipv6/ndisc.c