Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6

include/linux/fib_rules.h

include/linux/rtnetlink.h

include/net/fib_rules.h

net/core/fib_rules.c

net/core/rtnetlink.c

net/decnet/dn_rules.c

net/ipv4/fib_rules.c

net/ipv4/ipmr.c

net/ipv6/fib6_rules.c