From: Jiri Kosina Date: Mon, 22 Jun 2015 14:26:56 +0000 (+0200) Subject: Merge branches 'for-4.1/upstream-fixes', 'for-4.2/kaslr' and 'for-4.2/upstream' into... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=110c146645140636995c3cf6c6d782008ff67ce8;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branches 'for-4.1/upstream-fixes', 'for-4.2/kaslr' and 'for-4.2/upstream' into for-linus --- 110c146645140636995c3cf6c6d782008ff67ce8