| commit | 3a07bd6fead4f00f67b1bf5f551e686661c4f52c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Jun 24 02:58:51 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Jun 24 02:58:51 2015 -0700 |
| tree | f8b8f257d928a9ae1aeb3fdbe748f03f1012f02e | |
| parent | 204621551b2a0060a013b92f7add4d5c452fa7cb [diff] | |
| parent | f1590670ce069eefeb93916391a67643e6ad1630 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/mellanox/mlx4/main.c net/packet/af_packet.c Both conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>