git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cec32a4 09d5160)
Merge Linus master into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 20 Apr 2015 01:32:26 +0000 (11:32 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 20 Apr 2015 03:05:20 +0000 (13:05 +1000)
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>

Trivial merge
Pandora Kernel Repository