| commit | 4bcc7827b02feea2c762fa6d46a1bffb300d7403 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Apr 08 09:01:54 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Apr 08 09:01:54 2015 +0200 |
| tree | 45fd2b64247cd44201fe519720494d4bf01b7014 | |
| parent | 3f705dfdf85a6416f5f12e52b7610144a99cbedc [diff] | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 [diff] |
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>