]> err.no Git - linux-2.6/commitdiff
Merge branch 'net.b0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
authorJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 19:15:02 +0000 (14:15 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 19:15:02 +0000 (14:15 -0500)

Trivial merge