From: Florian Fainelli Date: Fri, 22 Apr 2016 19:22:04 +0000 (-0700) Subject: Merge tag 'bcm2835-dt-next-2016-04-20' into devicetree/next X-Git-Tag: Ubuntu-4.8.0-22.24~1270^2~31^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3db62afd11738f896ef83132022a40be74961860;p=mirror_ubuntu-zesty-kernel.git Merge tag 'bcm2835-dt-next-2016-04-20' into devicetree/next This pull request brings in VC4 devicetree support and the other minor DT changes for 4.7. Also included is a DRM patch necessary to prevent regressions when simplefb and vc4 drivers are both present. The patch was suggested by the simplefb maintainer as the solution agreed upon at ELCE 2014, and was acked by the DRM maintainer for merging through this tree. Signed-off-by: Florian Fainelli --- 3db62afd11738f896ef83132022a40be74961860