tree 39e1a39f984bf450ee37a1ded6113d0b998b3a6d
parent 9830e44f560de2f9f9453bb7f0eb2979b36ed139
parent 7a444d1f0b557c68f847050b33713ae7b56f25e7
author Dave Airlie <airlied@redhat.com> 1392762086 +1000
committer Dave Airlie <airlied@redhat.com> 1392762086 +1000

Merge tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes

Pull request of 2014-02-18

One compile fix and one memory leak.

* tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux:
  drm/ttm: Fix memory leak in ttm_agp_backend.c
  drm/ttm: declare 'struct device' in ttm_page_alloc.h