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
..
calibrate.c	x86: remove stray <6> in BogoMIPS printk	2008-07-28 14:22:26 +02:00
do_mounts.c	init: DEBUG_BLOCK_EXT_DEVT requires explicit root= param	2008-10-09 08:56:11 +02:00
do_mounts.h	make init/do_mounts.c:root_device_name static	2008-07-26 12:00:12 -07:00
do_mounts_initrd.c	Freezer: Fix s2disk resume from initrd	2007-11-20 22:22:42 -05:00
do_mounts_md.c	init/do_mounts_md.c: remove duplicated #include	2008-11-01 10:35:51 -07:00
do_mounts_rd.c	identify_ramdisk_image(): correct typo about return value in comment	2008-10-16 11:21:30 -07:00
initramfs.c	initramfs: add option to preserve mtime from initramfs cpio images	2008-10-16 11:21:31 -07:00
Kconfig	Kconfig: SLUB is the default slab allocator	2008-11-13 20:49:01 +02:00
main.c	CRED: Inaugurate COW credentials	2008-11-14 10:39:23 +11:00
Makefile	kbuild: fix make V=1	2008-02-11 17:43:54 +01:00
noinitramfs.c	[PATCH] disable init/initramfs.c	2007-02-11 10:51:25 -08:00
version.c	init/version.c: define version_string only if CONFIG_KALLSYMS is not defined	2008-07-25 10:53:29 -07:00