From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 6 Dec 2013 01:18:28 +0000 (+0100)
Subject: Merge branches 'pm-epoll', 'pnp' and 'powercap'
X-Git-Tag: drm-fsl-dcu-for-next~6267^2
X-Git-Url: http://git.agner.ch/gitweb/?p=linux-drm-fsl-dcu.git;a=commitdiff_plain;h=8e7030097e9f3ea8031e8cc4230e357cb556f8f9;hp=-c

Merge branches 'pm-epoll', 'pnp' and 'powercap'

* pm-epoll:
  epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled

* pnp:
  PNP: fix restoring devices after hibernation

* powercap:
  PowerCap: Fix mode for energy counter
---

8e7030097e9f3ea8031e8cc4230e357cb556f8f9