linux-sg2042/fs/autofs4
James Morris 2b82892565 Merge branch 'master' into next
Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>
2008-11-14 11:29:12 +11:00
..
Makefile autofs4: add miscellaneous device for ioctls 2008-10-16 11:21:39 -07:00
autofs_i.h autofs4: add miscellaneous device for ioctls 2008-10-16 11:21:39 -07:00
dev-ioctl.c Merge branch 'master' into next 2008-11-14 11:29:12 +11:00
expire.c autofs4: correct offset mount expire check 2008-11-06 15:41:17 -08:00
init.c autofs4: add miscellaneous device for ioctls 2008-10-16 11:21:39 -07:00
inode.c CRED: Wrap task credential accesses in the autofs4 filesystem 2008-11-14 10:38:46 +11:00
root.c [PATCH] fix ->llseek() for a bunch of directories 2008-08-25 01:18:09 -04:00
symlink.c [PATCH] mark struct inode_operations const 1 2007-02-12 09:48:46 -08:00
waitq.c CRED: Wrap task credential accesses in the autofs4 filesystem 2008-11-14 10:38:46 +11:00