From: Linus Torvalds Date: Fri, 19 Dec 2008 19:36:04 +0000 (-0800) Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... X-Git-Tag: v2.6.28~21 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f3485c82f75eeb951162dda663f45714627a85f5;p=linux-2.6-omap-h63xx.git 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. --- f3485c82f75eeb951162dda663f45714627a85f5