Files
i2som-imx-linux/include/linux
David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-11-26 23:42:21 -05:00
..
2016-11-11 23:23:02 +01:00
2016-11-15 22:34:25 -05:00
2016-10-30 13:09:42 -04:00
2016-10-20 15:51:28 +11:00
2016-10-24 19:13:20 -07:00
2016-11-16 18:32:02 -05:00
2016-10-19 11:36:22 -06:00
2016-10-31 16:18:30 -04:00