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)
commitbb611874650cff942a7466b456a791e8bfa641e7
tree32e048e3240dd808e7787ff2b7eb50ed9f0a6182
parentd328bc839eac685cdd91f5d9d8ad95c070252038
parentcb6a4e461fb427689920472bd7335f926d521747
Merge branch 'master' of git://git./linux/kernel/git/kaber/ipmr-2.6
net/core/rtnetlink.c