David S. Miller 638d3c6381 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>
2015-07-13 17:28:09 -07:00
..
2015-04-01 12:43:09 -04:00
2015-07-11 21:12:23 -07:00
2015-07-08 16:00:09 -07:00
2015-07-03 16:02:25 -07:00
2015-04-02 14:05:01 -04:00