From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 5 Aug 2014 20:50:00 +0000 (+0200)
Subject: Merge branch 'pm-tools'
X-Git-Tag: v3.17-rc1~99^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49c68fd448568e79598b159efc09a7864bc59ede;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pm-tools'

* pm-tools:
  cpupower: Remove redundant error check
  cpupower: bench: parse.c: Fix several minor errors
  cpupower: mperf monitor: Correct use of ! and &
  cpupower: Adjust MAINTAINERS file
  PM / tools: cpupower: drop negativity check on unsigned value
---

49c68fd448568e79598b159efc09a7864bc59ede