projects / h-e-n / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: db873cf ac5c4e7)
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Dec 2008 19:36:04 +0000 (11:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Dec 2008 19:36:04 +0000 (11:36 -0800)
commitf3485c82f75eeb951162dda663f45714627a85f5
tree8ffbcdba50bbbecbf1beee698a515d3342b415actree | snapshot
parentdb873cfc7c0a6f34ab0f1c811fc245273adf35afcommit | diff
parentac5c4e76180a74c7f922f6fa71ace0cef45fa433commit | diff
Merge branch 'drm-fixes' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/i915: GEM on PAE has problems - disable it for now.
  drm/i915: Don't return busy for buffers left on the flushing list.
Unnamed repository; edit this file to name it for gitweb.