You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/sfc/rx.c Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change the rx_buf->is_page boolean into a set of u16 flags, and another to adjust how ->ip_summed is initialized. Signed-off-by: David S. Miller <davem@davemloft.net>		13 years ago
..
Makefile	…
atl1c.h	…
atl1c_ethtool.c	…
atl1c_hw.c	atheros eth: set addr_assign_type if random_ether_addr() used	13 years ago
atl1c_hw.h	…
atl1c_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	13 years ago