diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-11-12 10:29:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-11-12 17:53:30 +1000 |
| commit | 51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7 (patch) | |
| tree | 4125e1888cbc215ec4a365457505a407f48e5232 /Documentation/devicetree/bindings/pci/xgene-pci.txt | |
| parent | cc7096fb6d1dfbdac5e7e2675c046fd40646cc66 (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
| download | blackbird-op-linux-51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7.tar.gz blackbird-op-linux-51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7.zip | |
Merge tag 'v3.18-rc4' into drm-next
backmerge to get vmwgfx locking changes into next as the
conflict with per-plane locking.
Diffstat (limited to 'Documentation/devicetree/bindings/pci/xgene-pci.txt')
0 files changed, 0 insertions, 0 deletions
