| commit | 7ce7f35b33eb42b6aa4cf176fa34372b21b8472b | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Wed Nov 16 14:19:34 2016 +0100 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Wed Nov 16 14:19:34 2016 +0100 |
| tree | 12f3027003f1d7cce30f838265e4fab2d52c6cef | |
| parent | f410770293a1fbc08906474c24104a7a11943eb6 [diff] | |
| parent | 47bdf3378d62a627cfb8a54e1180c08d67078b61 [diff] |
Merge branch 'x86/cpufeature' into x86/cache Resolve the cpu/scattered conflict. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>