tree 84be4142aa64d847874425041e5589a4b6382b82
parent ca9efa17413320694760f70805f0bee7d70224df
parent 3943875e7b73fdd94dd9e911d69f0cee9ab66a89
author Dave Airlie <airlied@redhat.com> 1384386730 +1000
committer Dave Airlie <airlied@redhat.com> 1384386730 +1000

Merge branch 'ttm-next-3.13' of git://people.freedesktop.org/~thomash/linux into drm-next

The page-prot bit fix.

* 'ttm-next-3.13' of git://people.freedesktop.org/~thomash/linux:
  drm/ttm: Fix vma page_prot bit manipulation