From: Dave Airlie <airlied@redhat.com>
Date: Tue, 31 Mar 2015 03:38:01 +0000 (+1000)
Subject: Merge branch 'drm-atmel-hlcdc-4.1-fixes' of git://github.com/bbrezillon/linux-at91... 
X-Git-Tag: firefly_0821_release~176^2~1915^2~21
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d7de390bff7ad0f551fc0e409543e98db86a65df;p=firefly-linux-kernel-4.4.55.git

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
---

d7de390bff7ad0f551fc0e409543e98db86a65df