git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Sun, 15 Apr 2012 17:19:04 +0000 (13:19 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sun, 15 Apr 2012 17:19:04 +0000 (13:19 -0400)
commit	2be59c0718595624f8e287c4c2cdfb011e0b69e6
tree	f891afed5324d359da1713a80a7131968373acc4	tree \| snapshot
parent	a3e17141dde26b498f4a33e8139dfe0fc2e874d2	commit \| diff
parent	059d3724a414a5f0cf032ef5ab9db9f9d953064a	commit \| diff

Merge git://git.kernel.org/pub/scm/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>

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/atlx/atl1.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/atlx/atl1.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/atlx/atlx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/ich8lan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/8139cp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/smsc/smsc911x.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ndisc.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history