git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cec32a4 09d5160)

author	Dave Airlie <airlied@redhat.com>
	Mon, 20 Apr 2015 01:32:26 +0000 (11:32 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Mon, 20 Apr 2015 03:05:20 +0000 (13:05 +1000)
commit	2c33ce009ca2389dbf0535d0672214d09738e35e
tree	6186a6458c3c160385d794a23eaf07c786a9e61b	tree \| snapshot (tar.gz zip)
parent	cec32a47010647e8b0603726ebb75b990a4057a4	commit \| diff
parent	09d51602cf84a1264946711dd4ea0dddbac599a1	commit \| 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>