David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/altera/altera_sgdma.c net/netlink/af_netlink.c net/sched/cls_api.c net/sched/sch_api.c The netlink conflict dealt with moving to netlink_capable() and netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations in non-init namespaces. These were simple transformations from netlink_capable to netlink_ns_capable. The Altera driver conflict was simply code removal overlapping some void pointer cast cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-12 13:19:14 -04:00
..
cxgb	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
cxgb3	cxgb3: Call dev_kfree/consume_skb_any instead of [dev_]kfree_skb.	2014-03-24 21:18:57 -07:00
cxgb4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
cxgb4vf	cxgb4vf: Check if rx checksum offload is enabled, while reading hardware calculated checksum	2014-05-12 12:47:46 -04:00
Kconfig	cxgb4: Update Kconfig to include Chelsio T5 adapter	2014-04-27 19:14:36 -04:00
Makefile	…