Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Apr 2010 19:57:39 +0000 (12:57 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Apr 2010 19:57:39 +0000 (12:57 -0700)
1  2 
net/core/rtnetlink.c

Simple merge