Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:57:19 +0000 (13:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:57:19 +0000 (13:57 -0800)
commit970965270315e15b3ec3a3e0d734fb03b85f6875
tree891b39cb3f388ec79a162f5aa217a23efa421f61
parentb54eb1795c0cfeb6cc48fdcbd010e800541750ad
parentca9ab10033d190c1ede85fdf456307bdfdabf079
Merge branch 'for-linus' of git://git./linux/kernel/git/anholt/drm-intel

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: Select CONFIG_SHMEM
  drm/i915: Fix CRT hotplug detect by checking really no channels attached
  agp/intel: new host bridge support
  drm/i915: Add more registers save/restore for Ironlake suspend
  drm/i915: Fix IRQ stall issue on Ironlake
  drm/i915: HDMI hardware workaround for Ironlake
  drm/i915: Fix and cleanup DPLL calculation for Ironlake
  drm/i915: Avoid potential sleep whilst holding spinlock
drivers/char/agp/intel-agp.c