tree 6186a6458c3c160385d794a23eaf07c786a9e61b
parent cec32a47010647e8b0603726ebb75b990a4057a4
parent 09d51602cf84a1264946711dd4ea0dddbac599a1
author Dave Airlie <airlied@redhat.com> 1429493546 +1000
committer Dave Airlie <airlied@redhat.com> 1429499120 +1000

Merge Linus master into drm-next

The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.

I've included the patch into the merge to fix the build.

Signed-off-by: Dave Airlie <airlied@redhat.com>