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

Linux-2.6.12-rc2

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

debug.h

Linux-2.6.12-rc2

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

lockd.h

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

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

nlm.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

share.h

LOCKD: Make nlmsvc_traverse_shares return void

2006-03-20 23:24:25 -05:00

sm_inter.h

Linux-2.6.12-rc2

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

xdr4.h

Linux-2.6.12-rc2

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

xdr.h

lockd: Don't expose the process pid to the NLM server

2006-03-20 13:44:06 -05:00