Trond Myklebust 70ac4385a1 Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ ...

Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.

2006-06-20 20:46:21 -04:00

..

bind.h

…

debug.h

…

lockd.h

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

2006-06-20 20:46:21 -04:00

nlm.h

…

share.h

…

sm_inter.h

…

xdr4.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

xdr.h

…