Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 16:06:09 +0000 (08:06 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 16:06:09 +0000 (08:06 -0800)

Trivial merge