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>		2012-02-26 21:55:51 -05:00
..
Kconfig	drivers: misc: Remove MISC_DEVICES config option	2012-01-24 16:24:02 -08:00
ks8695net.c	netdev: ethernet dev_alloc_skb to netdev_alloc_skb	2012-02-06 11:52:27 -05:00
ks8695net.h	ks8*/ksz8*: Move the Micrel drivers	2011-08-12 00:22:18 -07:00
ks8842.c	net: use eth_hw_addr_random() and reset addr_assign_type	2012-02-15 15:34:17 -05:00
ks8851_mll.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-26 21:55:51 -05:00
ks8851.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-19 16:03:15 -05:00
ks8851.h	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
ksz884x.c	netdev: ethernet dev_alloc_skb to netdev_alloc_skb	2012-02-06 11:52:27 -05:00
Makefile	ks8*/ksz8*: Move the Micrel drivers	2011-08-12 00:22:18 -07:00