| commit | 1e1b37273cf719545da50b76f214f983a710aaf4 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Mon Sep 26 15:47:03 2016 -0400 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Mon Sep 26 15:47:03 2016 -0400 |
| tree | 033f6062325ef7aaeefe8559bb409ab7d2be3c76 | |
| parent | c183a603e8d8a5a189729b77d0c623a3d5950e5f [diff] | |
| parent | c291b015158577be533dd5a959dfc09bab119eed [diff] |
Merge branch 'x86/urgent' into x86/apic Bring in the upstream modifications so we can fixup the silent merge conflict which is introduced by this merge. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>