From: Dave Airlie Date: Mon, 20 Apr 2015 01:32:26 +0000 (+1000) Subject: Merge Linus master into drm-next X-Git-Tag: omap-for-v4.1/fixes-rc1~82^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c33ce009ca2389dbf0535d0672214d09738e35e;p=pandora-kernel.git 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 --- 2c33ce009ca2389dbf0535d0672214d09738e35e Reading git-diff-tree failed