tree e0f4dbdbf5078d4a707911177e7bdc17a70bdce5
parent c50cd357887acf9fd7af3a5d492911bd825555a2
parent 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376
author David S. Miller <davem@davemloft.net> 1372888241 -0700
committer David S. Miller <davem@davemloft.net> 1372888513 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/ethernet/renesas/sh_eth.c
	net/ipv4/gre.c

The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list)
and the splitting of the gre.c code into seperate files.

The FEC conflict was two sets of changes adding ethtool support code
in an "!CONFIG_M5272" CPP protected block.

Finally the sh_eth.c conflict was between one commit add bits set
in the .eesr_err_check mask whilst another commit removed the
.tx_error_check member and assignments.

Signed-off-by: David S. Miller <davem@davemloft.net>