commit | 59b0b70f51c1d7f22cdc4f8905cad15f19ed60ff | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Fri Jun 24 10:34:49 2016 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Fri Jun 24 10:34:49 2016 +1000 |
tree | 214fde698cb82bc0ba03a03412fc73c355fb63fa | |
parent | f762bfda2b81db4c3397a31e92f819818cf04efb [diff] | |
parent | 0b1e1eb76220afa043b2733dfe61f5927cf0e458 [diff] |
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