diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-01 16:38:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-01 16:38:59 -0700 |
commit | c66a86d0cdce3bad2da794f114cc37377d242c3d (patch) | |
tree | 4603bb4a464439275c07ebf66ec4a69ebc8fafc3 /drivers/gpu/drm/radeon/nid.h | |
parent | c9e0b8454582b413bc64c16693c7979417cad3eb (diff) | |
parent | 2b1ecb7337592a7bf0989efac46a5b52daab769e (diff) |
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: apply HWSTAM writes to Ivy Bridge as well
drm/i915: move IRQ function table init to i915_irq.c
drm/i915/overlay: Fix unpinning along init error paths
drm/i915: Don't call describe_obj on NULL pointers
drm/i915: Hold struct_mutex during i915_save_state/i915_restore_state
Diffstat (limited to 'drivers/gpu/drm/radeon/nid.h')
0 files changed, 0 insertions, 0 deletions