commit | e52f649e5b7ad61edfe2b7273831fa3b64c76149 | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Fri May 15 15:20:45 2015 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Fri May 15 15:20:45 2015 +1000 |
tree | 24e58665df46d3fe56900967d4bac563458c1c18 | |
parent | 030bbdbf4c833bc69f502eae58498bc5572db736 [diff] | |
parent | bed447e7d1bd2d32d3fb09b4de0d0d5a23d3f82b [diff] |
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes radeon minor fixes, and pci id addition. * 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: don't do mst probing if MST isn't enabled. drm/radeon: add new bonaire pci id drm/radeon: fix VM_CONTEXT*_PAGE_TABLE_END_ADDR handling