Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 13 May 2010 06:30:45 +0000 (23:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 May 2010 06:30:45 +0000 (23:30 -0700)
commitbf47f4b0babe287f250dd720b41ecad9b8f7ac9b
tree0829ef3bff455f98155b5cb0e91b71db36de3510
parent0b9715e64f7d46a9620d4d5042a5e28f5595ed54
parent5b285cac3570a935aaa28312c1ea28f9e01c5452
Merge branch 'master' of git://git./linux/kernel/git/kaber/ipmr-2.6