[IPV4]: mroute annotations
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 28 Sep 2006 01:39:29 +0000 (18:39 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 29 Sep 2006 01:02:22 +0000 (18:02 -0700)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/mroute.h
net/ipv4/ipmr.c

Simple merge
diff --cc net/ipv4/ipmr.c
Simple merge