| commit | 638d3c63811e31b2745f7fdd568b38c8abcffe03 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Jul 13 17:28:09 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jul 13 17:28:09 2015 -0700 |
| tree | 606426ab4de84e59c5f50e1e3cce6e24819d45af | |
| parent | 74fe61f17e999a458d5f64ca2aa9a0282ca32198 [diff] | |
| parent | f760b87f8f12eb262f14603e65042996fe03720e [diff] |
Merge git://git.kernel.org/pub/scm/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>