Merge branch 'drm-atmel-hlcdc-fixes' of https://github.com/bbrezillon/linux-at91...
authorDave Airlie <airlied@redhat.com>
Wed, 19 Aug 2015 23:40:06 +0000 (09:40 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 19 Aug 2015 23:40:06 +0000 (09:40 +1000)
commit82bd279d0b2ed538cd932978ffd7ec33587313f2
tree87e8a6c2bc7b9d8c7aae6bcf60c8f5d45a062eed
parent1b647a166f07dcf08709c8606470f4b17a4aa11d
parentdbb3df2d58754e4df58620e60370d166c2cb6744
Merge branch 'drm-atmel-hlcdc-fixes' of https://github.com/bbrezillon/linux-at91 into drm-fixes

single atmel hlcdc fix.

* 'drm-atmel-hlcdc-fixes' of https://github.com/bbrezillon/linux-at91:
  drm/atmel-hlcdc: Compile suspend/resume for PM_SLEEP only