From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Dec 2005 17:35:05 +0000 (-0800)
Subject: Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
X-Git-Tag: v2.6.15-rc7~16^2~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc7e13104f823d1ea9c1f4dd7531c14b0c1e6e7e;p=linux-2.6

Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
---

fc7e13104f823d1ea9c1f4dd7531c14b0c1e6e7e