tree 9e6ed2c499cb5cbbcc79415602f9114503bb6931
parent 0c63d80c3fac4e6eb0f01dff756e47bc7cd50092
parent ebac62fe3d24c0ce22dd83afa7b07d1a2aaef44d
author David S. Miller <davem@davemloft.net> 1446576105 -0500
committer David S. Miller <davem@davemloft.net> 1446576105 -0500

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
fixing the "BH-ness" of the counter bumps whilst in 'net-next'
the functions were modified to take an explicit 'net' parameter.

Signed-off-by: David S. Miller <davem@davemloft.net>