summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_stp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-06-24 11:58:51 +0200
committerDavid S. Miller <davem@davemloft.net>2015-06-24 11:58:51 +0200
commit3a07bd6fead4f00f67b1bf5f551e686661c4f52c (patch)
treef8b8f257d928a9ae1aeb3fdbe748f03f1012f02e /net/bridge/br_stp.c
parentnet: inet_diag: export IPV6_V6ONLY sockopt (diff)
parentstmmac: troubleshoot unexpected bits in des0 & des1 (diff)
downloadlinux-3a07bd6fead4f00f67b1bf5f551e686661c4f52c.tar.xz
linux-3a07bd6fead4f00f67b1bf5f551e686661c4f52c.zip
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>
Diffstat (limited to 'net/bridge/br_stp.c')
0 files changed, 0 insertions, 0 deletions