git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2046215 f159067)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 24 Jun 2015 09:58:51 +0000 (02:58 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Jun 2015 09:58:51 +0000 (02:58 -0700)
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>

Trivial merge
Pandora Kernel Repository