tree f68709a01e8dd53f86374dba94bd5c0c2ebeac4f
parent e5b1d9cc1dc7cf76147411f1a74f64b570e148e3
parent 498ca793d90aef8ad38a852a969c257f62832738
author Linus Torvalds <torvalds@linux-foundation.org> 1314293538 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1314293538 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils:
  cpupower: use man(1) when calling "cpupower help subcommand"
  cpupower: make NLS truly optional
  cpupower: fix Makefile typo
  cpupower: Make monitor command -c/--cpu aware
  cpupower: Better detect offlined CPUs
  cpupower: Do not show an empty Idle_Stats monitor if no idle driver is available
  cpupower: mperf monitor - Use TSC to calculate max frequency if possible
  cpupower: avoid using symlinks