git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.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	56845d78cee8576a8160cee8aeac62efdb561ae2
tree	f891afed5324d359da1713a80a7131968373acc4	tree \| snapshot
parent	df8ef8f3aaa6692970a436204c4429210addb23a	commit \| diff
parent	8a9a0ea6032186e3030419262678d652b88bf6a8	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 for KaRo TX COM modules

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