From: Dave Airlie Date: Fri, 24 Jun 2016 00:34:49 +0000 (+1000) Subject: Merge tag 'drm-atmel-hlcdc-fixes/for-4.7-rc5' of github.com:bbrezillon/linux-at91... X-Git-Tag: v4.7-rc5~24^2~3 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=59b0b70f51c1d7f22cdc4f8905cad15f19ed60ff;p=users%2Fjedix%2Flinux-maple.git Merge tag 'drm-atmel-hlcdc-fixes/for-4.7-rc5' of github.com:bbrezillon/linux-at91 into drm-fixes Two bug fixes for the atmel-hlcdc driver. * tag 'drm-atmel-hlcdc-fixes/for-4.7-rc5' of github.com:bbrezillon/linux-at91: drm: atmel-hlcdc: Fix OF graph parsing drm: atmel-hlcdc: actually disable scaling when no scaling is required --- 59b0b70f51c1d7f22cdc4f8905cad15f19ed60ff