Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 25 Aug 2006 05:29:46 +0000 (22:29 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 25 Aug 2006 05:29:46 +0000 (22:29 -0700)

Trivial merge