Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 Apr 2010 21:14:05 +0000 (14:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Apr 2010 21:14:05 +0000 (14:14 -0700)

Trivial merge