diff options
| author | Thomas Gleixner | 2016-11-16 14:19:34 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2016-11-16 14:19:34 +0100 |
| commit | 7ce7f35b33eb42b6aa4cf176fa34372b21b8472b (patch) | |
| tree | 12f3027003f1d7cce30f838265e4fab2d52c6cef /Documentation/devicetree/bindings/reset/socfpga-reset.txt | |
| parent | x86/intel_rdt: Update percpu closid immeditately on CPUs affected by changee (diff) | |
| parent | x86/cpuid: Provide get_scattered_cpuid_leaf() (diff) | |
| download | kernel-qcow2-linux-7ce7f35b33eb42b6aa4cf176fa34372b21b8472b.tar.gz kernel-qcow2-linux-7ce7f35b33eb42b6aa4cf176fa34372b21b8472b.tar.xz kernel-qcow2-linux-7ce7f35b33eb42b6aa4cf176fa34372b21b8472b.zip | |
Merge branch 'x86/cpufeature' into x86/cache
Resolve the cpu/scattered conflict.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation/devicetree/bindings/reset/socfpga-reset.txt')
0 files changed, 0 insertions, 0 deletions