]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jun 2011 18:15:57 +0000 (11:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jun 2011 18:15:57 +0000 (11:15 -0700)
commit0d72c6fcb5cd215eeab824fac216ea42c5b574aa
treeb2777db7513e14b0341088eea96c869a8071abc4
parentc89b857ce6d803905b2c9d71bc9effdd286c45ed
parentf01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915: Use chipset-specific irq installers
  drm/i915: forcewake fix after reset
  drm/i915: add Ivy Bridge page flip support
  drm/i915: split page flip queueing into per-chipset functions
drivers/gpu/drm/i915/i915_gem.c