summaryrefslogtreecommitdiff
path: root/src/global.h
AgeCommit message (Expand)AuthorFilesLines
2006-11-13Initial import15.6-2Tobias Klauser1-0/+413
<airlied@redhat.com>2016-05-09 13:49:56 +1000 commitbafb86f5bc3173479002555dea7f31d943b12332 (patch) tree6ec94c96460faf782cdb8781339560e13e0918b0 parentba391646d0d43aee3596b616113cce0f22dde627 (diff)parent44549e8f5eea4e0a41b487b63e616cb089922b99 (diff)
Merge tag 'v4.6-rc7' into drm-next
Merge this back as we've built up a fair few conflicts, and I have some newer trees to pull in.
Diffstat