| commit | f3485c82f75eeb951162dda663f45714627a85f5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 19 11:36:04 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 19 11:36:04 2008 -0800 |
| tree | 8ffbcdba50bbbecbf1beee698a515d3342b415ac | |
| parent | db873cfc7c0a6f34ab0f1c811fc245273adf35af [diff] | |
| parent | ac5c4e76180a74c7f922f6fa71ace0cef45fa433 [diff] |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/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.