| commit | 06ab9c1ba6a19977432b6906b0eee84804212dc6 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Tue Mar 24 21:14:07 2015 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Mar 25 13:19:43 2015 +0100 |
| tree | 6a69e2852e9ed71cd76d0d6b25694a361f64c306 | |
| parent | 72d64cc76941cde45e65e2a5b9fb81d527963645 [diff] | |
| parent | b3494a4ab20f6bdf74cdf2badf7918bb65ee8a00 [diff] |
Merge branch 'x86/urgent' into x86/asm, to resolve conflict Conflicts: arch/x86/kernel/entry_64.S Signed-off-by: Ingo Molnar <mingo@kernel.org>