tree 45fd2b64247cd44201fe519720494d4bf01b7014
parent 3f705dfdf85a6416f5f12e52b7610144a99cbedc
parent f22e6e847115abc3a0e2ad7bb18d243d42275af1
author Ingo Molnar <mingo@kernel.org> 1428476514 +0200
committer Ingo Molnar <mingo@kernel.org> 1428476514 +0200
mergetag object f22e6e847115abc3a0e2ad7bb18d243d42275af1
 type commit
 tag v4.0-rc7
 tagger Linus Torvalds <torvalds@linux-foundation.org> 1428359999 -0700
 
 Linux 4.0-rc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVIws/AAoJEHm+PkMAQRiGwEcH/1GCBqrBzXaKwDdCPMRcYVUb
 MYkXmGkCGRYWe5MXI8QNAaa/CdG6mAFMHWN6CaMMpLTxnM1m87uBg01fQMsh73BO
 mRVLKE/soiJDnR1gYzBBDBYV/AUvytN5PhgeNaA95YIJvU3T1f3iTnV8vs30Dp0L
 YpxSqwr3C0k7C9IE0VcgfzvWJPCnQ9IWHuX3jn5s1XjGKVNbBYHMt6FusHdyXMfT
 dp8ksuGHwm30mTFI5xJpKOrRzfi+P5EsEUrsnFRPRM/iFTVrM5R7eaUhsRZb2+Wo
 YApnbYhUYz7om1AuQ+UZ/+S6y7ZLlGWegI1lWI754GIsczG5vPHEYhhgkzMhTsc=
 =kR1V
 -----END PGP SIGNATURE-----

Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts

Conflicts:
	arch/x86/kernel/entry_64.S

Signed-off-by: Ingo Molnar <mingo@kernel.org>