From: Jiri Kosina Date: Fri, 3 Feb 2012 22:12:42 +0000 (+0100) Subject: Merge branch 'master' into for-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=972c5ae961d6e5103e2b33d935cfa4145fd47140;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'master' into for-next Sync with Linus' tree to be able to apply patch to a newer code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c) --- 972c5ae961d6e5103e2b33d935cfa4145fd47140