From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 21 Jun 2006 00:46:21 +0000 (-0400)
Subject: Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
X-Git-Tag: v2.6.18-rc1~861^2~12
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/70ac4385a13f78bc478f26d317511893741b05bd

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.
---

70ac4385a13f78bc478f26d317511893741b05bd