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-07-06 14:08:30 +02:00
2015-06-30 19:44:57 -07:00
2015-04-11 22:27:55 -04:00
2014-10-09 22:26:04 -04:00
2015-04-12 21:03:31 +02:00
2015-06-25 17:00:43 -07:00
2015-07-09 06:57:12 +09:30
2014-12-04 14:34:54 -05:00
2015-01-17 10:02:23 +13:00
2015-06-25 17:00:37 -07:00
2014-12-10 17:41:10 -08:00