Merge branch 'pm-tools' into pm-cpu

This commit is contained in:
Rafael J. Wysocki 2016-07-07 15:31:41 +02:00
commit 5ec398e94c