Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Dec 2005 17:35:05 +0000 (09:35 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Dec 2005 17:35:05 +0000 (09:35 -0800)

Trivial merge