diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-06-27 06:40:44 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-27 06:40:44 -0400 |
| commit | 4300a0f8bdcce5a03b88bfa16fc9827e15c52dc4 (patch) | |
| tree | dea0276d7d0a12147f04ddbef9121e32e903c5ca /arch/x86/kernel/relocate_kernel_64.S | |
| parent | 160954b7bca43da7cd3cfbce310e6df919a8216e (diff) | |
| parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
Merge tag 'v3.10-rc7' into drm-next
Linux 3.10-rc7
The sdvo lvds fix in this -fixes pull
commit c3456fb3e4712d0448592af3c5d644c9472cd3c1
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon Jun 10 09:47:58 2013 +0200
drm/i915: prefer VBT modes for SVDO-LVDS over EDID
has a silent functional conflict with
commit 990256aec2f10800595dddf4d1c3441fcd6b2616
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Fri May 31 12:17:07 2013 +0000
drm: Add probed modes in probe order
in drm-next. W simply need to add the vbt modes before edid modes, i.e. the
other way round than now.
Conflicts:
drivers/gpu/drm/drm_prime.c
drivers/gpu/drm/i915/intel_sdvo.c
Diffstat (limited to 'arch/x86/kernel/relocate_kernel_64.S')
| -rw-r--r-- | arch/x86/kernel/relocate_kernel_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S index 7a6f3b3be3cf..f2bb9c96720a 100644 --- a/arch/x86/kernel/relocate_kernel_64.S +++ b/arch/x86/kernel/relocate_kernel_64.S | |||
| @@ -160,7 +160,7 @@ identity_mapped: | |||
| 160 | xorq %rbp, %rbp | 160 | xorq %rbp, %rbp |
| 161 | xorq %r8, %r8 | 161 | xorq %r8, %r8 |
| 162 | xorq %r9, %r9 | 162 | xorq %r9, %r9 |
| 163 | xorq %r10, %r9 | 163 | xorq %r10, %r10 |
| 164 | xorq %r11, %r11 | 164 | xorq %r11, %r11 |
| 165 | xorq %r12, %r12 | 165 | xorq %r12, %r12 |
| 166 | xorq %r13, %r13 | 166 | xorq %r13, %r13 |