tree 9c132c7079b0cb48b19fa81231b679ddba766621
parent f7eeb8a87c033d126ff6b8c35405ba5dc4e55754
parent 34a4cceb78e48c75d1b48b25352a3f3b2cc2b2da
author Linus Torvalds <torvalds@linux-foundation.org> 1459683148 -0500
committer Linus Torvalds <torvalds@linux-foundation.org> 1459683148 -0500

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Thomas Gleixner:
 "This lot contains:

   - Some fixups for the fallout of the topology consolidation which
     unearthed AMD/Intel inconsistencies
   - Documentation for the x86 topology management
   - Support for AMD advanced power management bits
   - Two simple cleanups removing duplicated code"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu: Add advanced power management bits
  x86/thread_info: Merge two !__ASSEMBLY__ sections
  x86/cpufreq: Remove duplicated TDP MSR macro definitions
  x86/Documentation: Start documenting x86 topology
  x86/cpu: Get rid of compute_unit_id
  perf/x86/amd: Cleanup Fam10h NB event constraints
  x86/topology: Fix AMD core count