Merge branch 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 5 Aug 2014 20:50:00 +0000 (22:50 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 5 Aug 2014 20:50:00 +0000 (22:50 +0200)
* 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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge