tree e57f191ae048275bb8d0ab0aaeaee161e43a6f4d
parent 9f3252f1ad3f10a96a51ebd79b18ffc20664a1d8
parent 37dea8c52cacb4439eb183ad736747bb678d2a5d
author Linus Torvalds <torvalds@linux-foundation.org> 1428956511 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1428956511 -0700

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

Pull x86 cacheinfo sysfs changes from Ingo Molnar:
 "This tree converts the x86 cacheinfo sysfs code to use the generic
  code in drivers/base/cacheinfo.c.

  It's not intended to change the sysfs ABI:

      'This patch neither alters any existing sysfs entries nor their
       formating, however since the generic cacheinfo has switched to
       use the device attributes instead of the traditional raw
       kobjects, a directory named 'power' along with its standard
       attributes are added similar to any other device'"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu/cacheinfo: Fix cache_get_priv_group() for Intel processors
  x86/cacheinfo: Move cacheinfo sysfs code to generic infrastructure