From: David Howells Date: Tue, 22 Jul 2014 20:54:43 +0000 (+0100) Subject: Merge remote-tracking branch 'integrity/next-with-keys' into keys-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=64724cfc6eea920dbaada14f0fb978b1dd31192d;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge remote-tracking branch 'integrity/next-with-keys' into keys-next Signed-off-by: David Howells --- 64724cfc6eea920dbaada14f0fb978b1dd31192d