From: Jiri Kosina Date: Wed, 23 Jul 2008 13:26:10 +0000 (+0200) Subject: Merge branches 'upstream' and 'upstream-fixes' into for-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b22d8370061898f3029cdc2601fbdec493443f03;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branches 'upstream' and 'upstream-fixes' into for-linus --- b22d8370061898f3029cdc2601fbdec493443f03