git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1b47b98 896ad42)
Merge tag 'bcm2835-dt-next-2016-04-20' into devicetree/next
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 22 Apr 2016 19:22:04 +0000 (12:22 -0700)
committerFlorian Fainelli <f.fainelli@gmail.com>
Fri, 22 Apr 2016 19:22:04 +0000 (12:22 -0700)
commit3db62afd11738f896ef83132022a40be74961860
tree765bde814e558cad070421c0d8b3cd030d31ddc6tree
parent1b47b98acce2db0da632d056821420b33205b8b2commit | diff
parent896ad420db8d5ec4cc4727b786d15e28eb59b366commit | diff
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 <f.fainelli@gmail.com>
Unnamed repository; edit this file 'description' to name the repository.