Files
rockchip-kernel/include/uapi/linux
David S. Miller 0c1072ae02 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>
2013-07-03 14:55:13 -07:00
..
2013-04-26 16:08:16 +10:00
2013-05-06 15:55:19 -04:00
2012-10-16 18:49:15 -07:00
2013-03-27 14:37:47 +00:00
2013-06-24 16:39:05 -07:00
2013-02-14 00:54:17 -05:00
2013-03-28 01:20:42 -04:00
2013-06-13 17:51:04 -07:00
2013-07-01 18:20:33 -07:00
2013-03-17 19:40:50 -07:00
2013-06-26 18:01:46 +09:00
2013-06-19 18:30:27 -07:00
2013-06-11 11:06:34 +03:00
2013-02-27 19:10:22 -08:00
2013-04-19 14:57:57 -04:00
2012-11-16 10:15:35 -08:00
2013-03-06 15:40:53 -05:00
2013-03-17 14:35:13 -04:00
2013-03-22 16:19:59 -07:00
2013-03-21 12:36:33 -04:00
2013-05-02 13:40:15 +03:00