| commit | 2c33ce009ca2389dbf0535d0672214d09738e35e | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon Apr 20 11:32:26 2015 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Mon Apr 20 13:05:20 2015 +1000 |
| tree | 6186a6458c3c160385d794a23eaf07c786a9e61b | |
| parent | cec32a47010647e8b0603726ebb75b990a4057a4 [diff] | |
| parent | 09d51602cf84a1264946711dd4ea0dddbac599a1 [diff] |
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>