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)
commit791f58c0640f906d3f63518d3f02630dbbafb7a2
treeb2dbe627ee54b6676946075ff0ef7aa9401f8950
parentfd793d8905720595caede6bd26c5df6c0ecd37f8
parent8de53dfbf9a0a0f7538c005137059c5c021476e1
Merge branch 'master' of git://git./linux/kernel/git/kaber/ipmr-2.6