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

..

cache.c

fat: mmu_private race fix

2008-11-06 15:41:21 -08:00

dir.c

fat: i_blocks warning fix

2008-11-06 15:41:22 -08:00

fat.h

fat: i_blocks warning fix

2008-11-06 15:41:22 -08:00

fatent.c

fat: i_blocks warning fix

2008-11-06 15:41:22 -08:00

file.c

Merge branch 'master' into next

2008-11-14 11:29:12 +11:00

inode.c

Merge branch 'master' into next

2008-11-14 11:29:12 +11:00

Makefile

fat: move fs/vfat/* and fs/msdos/* to fs/fat

2008-11-06 15:41:20 -08:00

misc.c

fat: i_blocks warning fix

2008-11-06 15:41:22 -08:00

namei_msdos.c

fat: Cleanup msdos_lookup()

2008-11-06 15:41:21 -08:00

namei_vfat.c

fat: Kill d_invalidate() in vfat_lookup()

2008-11-06 15:41:21 -08:00