Merge branch 'drm-atmel-hlcdc-4.1-fixes' of git://github.com/bbrezillon/linux-at91...
authorDave Airlie <airlied@redhat.com>
Tue, 31 Mar 2015 03:38:01 +0000 (13:38 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 31 Mar 2015 03:38:01 +0000 (13:38 +1000)
commitd7de390bff7ad0f551fc0e409543e98db86a65df
treefbf28d2b4f40e674fa6a179d5f6f4e51ad1b15af
parentb1f389ecc20b95f0f64515588d3736e85146848f
parentf026eb6e031f704fad991fdeb76c40d7c4a301bd
Merge branch 'drm-atmel-hlcdc-4.1-fixes' of git://github.com/bbrezillon/linux-at91 into drm-next

add PM fix.

* 'drm-atmel-hlcdc-4.1-fixes' of git://github.com/bbrezillon/linux-at91:
  drm: atmel-hlcdc: use appropriate enabled flag in suspend/resume