From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 13 May 2014 15:42:29 +0000 (+0200)
Subject: Merge branches 'pm-sleep', 'powercap' and 'pnp' into linux-next
X-Git-Tag: next-20140516~71^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=47dc715a31df37992f4d90de6d0d9ead3b766e31;p=karo-tx-linux.git

Merge branches 'pm-sleep', 'powercap' and 'pnp' into linux-next

* pm-sleep:
  PM / hibernate: convert simple_strtoul to kstrtoul
  PM / hibernate: Documentation: Fix script for unswapping
  PM / hibernate: no kernel_power_off when pm_power_off NULL
  PM / hibernate: use unsigned local variables in swsusp_show_speed()

* powercap:
  powercap / RAPL: add new CPU IDs
  powercap / RAPL: further relax energy counter checks

* pnp:
  PNP / resources: remove positive test on unsigned values
---

47dc715a31df37992f4d90de6d0d9ead3b766e31