| commit | c5e40ee287db61a79af1746954ee03ebbf1ff8a3 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jul 23 00:41:16 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jul 23 00:41:16 2015 -0700 |
| tree | 007da00e75e9b84766ac4868421705300e1e2e14 | |
| parent | 052831879945be0d9fad2216b127147c565ec1b1 [diff] | |
| parent | c5dfd654d0ec0a28fe81e7bd4d4fd984a9855e09 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: net/bridge/br_mdb.c br_mdb.c conflict was a function call being removed to fix a bug in 'net' but whose signature was changed in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>