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

Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/lockd/lockd.h
Simple merge

diff --cc include/linux/nfs4.h
Simple merge