Ingo Molnar e4518ab90f Linux 4.0-rc5 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVD1VGAAoJEHm+PkMAQRiG7yoH/juKOQ1zbxi5M+mleDEEJtA0 RxQSojqEMWIKrWi8PNZxjENn1OZB6XOLIXOhlyAZBrmgsjO34p1DyXlZMznr/R8W kQ2Xxs061hRtB3OuruMIqOApUrjuqsaCwgbgUS1qWmqZcoyZN4oELyZMP6OOlqv5 UUBZm8MfyXGyxrCcg39mjct3VEOhiuEcvL6SUxOC380CdSVAnyqHFPcz0JVqMUn9 9RUBs0T9cMdhb0mZ2bfXzt6AKArj63G2nXOum+VzFcvspSm2U+MPIDCuoE+ZbTPS jqIAgG0rj1ezRyb5oeJrvlU0Yy3u/cXoMPs9+kORvpladooYNLti8ovh6qllm0I= =d/ye -----END PGP SIGNATURE----- Merge tag 'v4.0-rc5' into x86/asm, to resolve conflicts Conflicts: arch/x86/kernel/entry_64.S Signed-off-by: Ingo Molnar <mingo@kernel.org>		2015-03-23 11:13:15 +01:00
..
.gitignore	x86, boot: add new generated files to the appropriate .gitignore files	2009-06-02 21:13:30 -07:00
aslr.c	Revert "x86/mm/ASLR: Propagate base load address calculation"	2015-03-16 11:18:21 +01:00
cmdline.c	x86, kaslr: Return location from decompress_kernel	2013-10-13 03:12:07 -07:00
cpuflags.c	x86, boot: Rename get_flags() and check_flags() to *_cpuflags()	2013-10-13 04:08:56 -07:00
early_serial_console.c	x86, boot: Don't compile early_serial_console.c when !CONFIG_EARLY_PRINTK	2014-08-17 14:58:24 -07:00
eboot.c	x86_64: kasan: add interceptors for memset/memmove/memcpy functions	2015-02-13 21:21:41 -08:00
eboot.h	efi/x86: Move x86 back to libstub	2014-11-11 22:23:11 +00:00
efi_stub_32.S	x86, efi: EFI boot stub support	2011-12-12 14:26:10 -08:00
efi_stub_64.S	x86/efi: Avoid triple faults during EFI mixed mode calls	2015-02-13 15:42:56 +00:00
efi_thunk_64.S	x86/efi: Avoid triple faults during EFI mixed mode calls	2015-02-13 15:42:56 +00:00
head_32.S	x86/asm/boot: Use already defined KEEP_SEGMENTS macro in head_{32,64}.S	2015-02-19 10:05:04 +01:00
head_64.S	x86/asm/boot: Use already defined KEEP_SEGMENTS macro in head_{32,64}.S	2015-02-19 10:05:04 +01:00
Makefile	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-02-21 10:41:29 -08:00
misc.c	Revert "x86/mm/ASLR: Propagate base load address calculation"	2015-03-16 11:18:21 +01:00
misc.h	Revert "x86/mm/ASLR: Propagate base load address calculation"	2015-03-16 11:18:21 +01:00
mkpiggy.c	x86, kaslr: Prevent .bss from overlaping initrd	2014-11-01 22:20:50 +01:00
string.c	x86, boot: Remove misc.h inclusion from compressed/string.c	2014-05-08 08:00:06 -07:00
vmlinux.lds.S	x86, setup: Allow global variables and functions in the decompressor	2010-08-02 15:34:44 -07:00