Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 May 2017 03:32:48 +0000 (23:32 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 May 2017 03:32:48 +0000 (23:32 -0400)
commit218b6a5b23e939caf2064549b1cb61ba22b9d0a1
treebdabf5439fb58905268953165779614d2aadb677
parent1db3a61017c627d590315347ccf302d9a6b97970
parentfadd2ce5a3680fb265694f573cbfb8bcb7d6c9d5
Merge git://git./linux/kernel/git/davem/net
net/bridge/br_stp_if.c
net/ipv4/tcp.c