From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 22 Jun 2005 21:32:15 +0000 (-0700)
Subject: Merge rsync://client.linux-nfs.org/pub/linux/nfs-2.6
X-Git-Tag: v2.6.13-rc4~130^2~157
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9092131f7ea2f9e92a510ae13ac4d20165aa921c;p=linux-2.6-omap-h63xx.git

Merge rsync://client.linux-nfs.org/pub/linux/nfs-2.6
---

9092131f7ea2f9e92a510ae13ac4d20165aa921c