Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 15 Apr 2012 17:19:04 +0000 (13:19 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Apr 2012 17:19:04 +0000 (13:19 -0400)
commit56845d78cee8576a8160cee8aeac62efdb561ae2
treef891afed5324d359da1713a80a7131968373acc4
parentdf8ef8f3aaa6692970a436204c4429210addb23a
parent8a9a0ea6032186e3030419262678d652b88bf6a8
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/atheros/atlx/atl1.c
drivers/net/ethernet/atheros/atlx/atl1.h

Resolved a conflict between a DMA error bug fix and NAPI
support changes in the atl1 driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS
drivers/net/ethernet/atheros/atlx/atl1.c
drivers/net/ethernet/atheros/atlx/atl1.h
drivers/net/ethernet/atheros/atlx/atlx.c
drivers/net/ethernet/intel/e1000e/ich8lan.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/realtek/8139cp.c
drivers/net/ethernet/smsc/smsc911x.c
net/ipv6/addrconf.c
net/ipv6/ndisc.c
net/ipv6/route.c