diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2016-04-22 22:22:04 +0300 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2016-04-22 22:22:04 +0300 |
| commit | 3db62afd11738f896ef83132022a40be74961860 (patch) | |
| tree | 765bde814e558cad070421c0d8b3cd030d31ddc6 /net/lapb/lapb_subr.c | |
| parent | 1b47b98acce2db0da632d056821420b33205b8b2 (diff) | |
| parent | 896ad420db8d5ec4cc4727b786d15e28eb59b366 (diff) | |
| download | linux-3db62afd11738f896ef83132022a40be74961860.tar.xz | |
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>
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions