commit | c0bb80cfa3c37fd92f066e328d83656067519a5f | [log] [tgz] |
---|---|---|
author | Thomas Gleixner <tglx@linutronix.de> | Fri Aug 25 08:56:22 2017 +0200 |
committer | Thomas Gleixner <tglx@linutronix.de> | Fri Aug 25 08:56:22 2017 +0200 |
tree | fad29579615daaf7d36364e4b45702db0c709044 | |
parent | adfaf18334cbf16c563e4ebc67e968ea1b17ec51 [diff] | |
parent | ecda85e70277ef24e44a1f6bc00243cebd19f985 [diff] |
Merge branch 'x86/asm' into x86/apic Pick up dependent changes to avoid merge conflicts