]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: a18d3af b7f5b7d)
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Feb 2012 23:25:39 +0000 (15:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Feb 2012 23:25:39 +0000 (15:25 -0800)
commit58e44bafbb601b5abc250cdbb032b1f4022ef30a
treee0b618339c64cf1a372e299a9f262dd7670c0b6etree
parenta18d3afefa0104419b5e069af5922bb57a302426commit | diff
parentb7f5b7dec3d539a84734f2bcb7e53fbb1532a40bcommit | diff
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

3 radeon fixes, I have some exynos fixes to push later but I'll queue
them separately once I've looked them over a bit.

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms: fix MSI re-arm on rv370+
  drm/radeon/kms/atom: bios scratch reg handling updates
  drm/radeon/kms: drop lock in return path of radeon_fence_count_emitted.
Unnamed repository; edit this file 'description' to name the repository.