summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_sdvo.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-14 00:02:31 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-14 00:02:31 +0100
commit373da0a2a33018d560afcb2c77f8842985d79594 (patch)
tree88f9ffb1357928e463514929a68781a79c1dca97 /drivers/gpu/drm/i915/intel_sdvo.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff)
parentRevert "x86, efi: Calling __pa() with an ioremap()ed address is invalid" (diff)
downloadlinux-373da0a2a33018d560afcb2c77f8842985d79594.tar.xz
linux-373da0a2a33018d560afcb2c77f8842985d79594.zip
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: Revert "x86, efi: Calling __pa() with an ioremap()ed address is invalid" x86, efi: Make efi_call_phys_{prelog,epilog} CONFIG_RELOCATABLE-aware
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
0 files changed, 0 insertions, 0 deletions