tree fcefaeced9562de840bbf11ec2ffc95e1d9a571f
parent c56716af8d27ca8dd6e45445ae1c0a05fd9753a6
parent bc465aa9d045feb0e13b4a8f32cc33c1943f62d6
author Ingo Molnar <mingo@kernel.org> 1427105595 +0100
committer Ingo Molnar <mingo@kernel.org> 1427105595 +0100
mergetag object bc465aa9d045feb0e13b4a8f32cc33c1943f62d6
 type commit
 tag v4.0-rc5
 tagger Linus Torvalds <torvalds@linux-foundation.org> 1427068230 -0700
 
 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>