diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-07-19 09:27:29 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-07-19 09:27:29 +0200 |
| commit | 2383050f6a3a2e00636eabfcf66445af653ddd80 (patch) | |
| tree | 45e5eb04a8ac280ce36f0d1e4305c8d816ee2e70 /drivers/net/ethernet/rocker/rocker_hw.h | |
| parent | drm/ttm: Delete an unnecessary check before the function call "ttm_tt_destroy" (diff) | |
| parent | Merge tag 'drm-vc4-next-2016-07-15' of https://github.com/anholt/linux into d... (diff) | |
| download | linux-2383050f6a3a2e00636eabfcf66445af653ddd80.tar.xz linux-2383050f6a3a2e00636eabfcf66445af653ddd80.zip | |
Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc
Backmerge drm-next to be able to apply Chris' connector_unregister_all
cleanup (need latest i915 and sun4i state for that).
Also there's a trivial conflict in ttm_bo.c that git rerere fails to
remember.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/net/ethernet/rocker/rocker_hw.h')
0 files changed, 0 insertions, 0 deletions