From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 6 Jan 2006 23:22:57 +0000 (-0800)
Subject: Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
X-Git-Tag: v2.6.16-rc1~935^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47853e7fa588bef826c9799a87b33904b32bd905;p=linux-2.6

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
---

47853e7fa588bef826c9799a87b33904b32bd905