| commit | e4518ab90f63cd5bea3ddc15341162debc34442b | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Mon Mar 23 11:13:15 2015 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Mon Mar 23 11:13:15 2015 +0100 |
| tree | fcefaeced9562de840bbf11ec2ffc95e1d9a571f | |
| parent | c56716af8d27ca8dd6e45445ae1c0a05fd9753a6 [diff] | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 [diff] |
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>