David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/amd/xgbe/xgbe-desc.c drivers/net/ethernet/renesas/sh_eth.c Overlapping changes in both conflict cases. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-12-10 15:48:20 -05:00
..
Makefile	amd-xgbe: Add traffic class support	2014-07-30 18:46:53 -07:00
xgbe-common.h	amd-xgbe: Tx engine must not be active before stopping it	2014-11-21 15:19:10 -05:00
xgbe-dcb.c	amd-xgbe: Checkpatch driver fixes	2014-09-05 15:11:20 -07:00
xgbe-debugfs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-09-07 21:41:53 -07:00
xgbe-desc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
xgbe-dev.c	amd-xgbe: Add support for the skb->xmit_more flag	2014-11-21 15:19:11 -05:00
xgbe-drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
xgbe-ethtool.c	ethtool: Support for configurable RSS hash function	2014-12-08 21:07:10 -05:00
xgbe-main.c	amd-xgbe: use netdev_rss_key_fill() helper	2014-11-16 15:59:11 -05:00
xgbe-mdio.c	amd-xgbe: Checkpatch driver fixes	2014-09-05 15:11:20 -07:00
xgbe-ptp.c	amd-xgbe: Checkpatch driver fixes	2014-09-05 15:11:20 -07:00
xgbe.h	amd-xgbe: IRQ names require allocated memory	2014-12-09 13:13:39 -05:00