From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 12 Jun 2014 15:46:02 +0000 (+0200)
Subject: Merge commit 'e81a0e771c10de86fdb52c6baf534ff5fdeec72c' into topic/soix
X-Git-Tag: firefly_0821_release~176^2~3450^2~63^2~13^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=64663b1936c93f8f27246e9b7c252ed6fb81fcba;p=firefly-linux-kernel-4.4.55.git

Merge commit 'e81a0e771c10de86fdb52c6baf534ff5fdeec72c' into topic/soix

Need to have a baseline of drm-next + acpi-next to merge new cool SOix
features for 3.17. No conflicts, so won't cause trouble.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

64663b1936c93f8f27246e9b7c252ed6fb81fcba