Merge branch 'drm-atmel-hlcdc-devel' of git://github.com/bbrezillon/linux-at91 into...
authorDave Airlie <airlied@redhat.com>
Wed, 4 Mar 2015 23:38:56 +0000 (09:38 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 4 Mar 2015 23:39:14 +0000 (09:39 +1000)
commit87dc8b6cbdd9c9f39aaf215767f151b62791df5c
tree0d85ef7755076500edd1dd07f7df93b46c92761e
parent7e4774843bff41d312850669e1dd5aa14edd7e9b
parent16e6004eb7a8686bae526ab9ea22c94ec901897b
Merge branch 'drm-atmel-hlcdc-devel' of git://github.com/bbrezillon/linux-at91 into drm-next

This pull request includes:
- support for Atomic mode setting
- the discard area optimization
- implementation of PM primitives

* 'drm-atmel-hlcdc-devel' of git://github.com/bbrezillon/linux-at91:
  drm: atmel-hlcdc: Add pinctrl PM select sleep,default state in CRTC suspend/resume
  drm: atmel-hlcdc: Add PM suspend/resume support
  drm: atmel-hlcdc: add discard area support
  drm: atmel-hlcdc: Atomic mode-setting conversion