From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Aug 2011 17:32:18 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils
X-Git-Tag: firefly_0821_release~3680^2~4587
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=be5378f3baabb5667508c42c56b4281f967d6861;p=firefly-linux-kernel-4.4.55.git

Merge git://git./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
---

be5378f3baabb5667508c42c56b4281f967d6861