Merge tag 'vmwgfx-next-15-08-21' of git://people.freedesktop.org/~thomash/linux into drm-next

Browse source

Pull request of 15-08-21

The third pull request for 4.3. Contains two fixes for regressions introduced
with previous pull requests.

* tag 'vmwgfx-next-15-08-21' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Remove duplicate ttm_bo_device_release
  drm/vmwgfx: Fix a circular locking dependency in the fbdev code

...

This commit is contained in:

Dave Airlie 2015-08-27 13:01:23 +10:00

parent 40b2dffbcc 36d4e87b49

commit 31607793ee

2 changed files with 17 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

View file

29

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

View file