projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 74fe61f f760b87)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 14 Jul 2015 00:28:09 +0000 (17:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Jul 2015 00:28:09 +0000 (17:28 -0700)
commit638d3c63811e31b2745f7fdd568b38c8abcffe03
tree606426ab4de84e59c5f50e1e3cce6e24819d45aftree | snapshot
parent74fe61f17e999a458d5f64ca2aa9a0282ca32198commit | diff
parentf760b87f8f12eb262f14603e65042996fe03720ecommit | diff
Merge git://git./linux/kernel/git/davem/net

Conflicts:
net/bridge/br_mdb.c

Minor conflict in br_mdb.c, in 'net' we added a memset of the
on-stack 'ip' variable whereas in 'net-next' we assign a new
member 'vid'.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_mdb.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
John Crispins staging tree