Dave Airlie 4300a0f8bd Linux 3.10-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) iQEbBAABAgAGBQJRxf9cAAoJEHm+PkMAQRiGMWkH911xM4gRmFgE7SqVW4F4AWBm ngcqMqNy9IdqKfibORUUDvVfEa5gjD5ai2quIKpfQiaukbpQJ696H90ijuAkajLn DQBrN243s0pzhhc/quWINnWxsFQ613JjdUMUMaD7e9A1aKjYzWrPGt/tSjrFXGCP tArTupVzc/iOmnEQDKiROI/Nokq44QJ36aTGPM7n08xMtpKmkCXM+9/UosBteB0O HVI33dmjwz7i55fI53XAWyuZCE+gSEnA4z8spJ9LfXso2W14V+roc+GuL6OyeeTI pCn/+4niVPb4B0ROZlpyVmdZjbPPcMMEK5o+BSJI68SH6LHZTQh2iVuqYfpSyA== =uUH5 -----END PGP SIGNATURE----- Merge tag 'v3.10-rc7' into drm-next Linux 3.10-rc7 The sdvo lvds fix in this -fixes pull commit c3456fb3e4 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 990256aec2 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		2013-06-27 20:40:44 +10:00
..
reg_srcs
.gitignore
atom-bits.h
atom-names.h
atom-types.h
atom.c
atom.h
atombios.h
atombios_crtc.c
atombios_dp.c
atombios_encoders.c	drm/radeon: don't allow audio on DCE6	2013-06-03 10:36:22 -04:00
atombios_i2c.c
avivod.h
cayman_blit_shaders.c
cayman_blit_shaders.h
evergreen.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
evergreen_blit_kms.c
evergreen_blit_shaders.c
evergreen_blit_shaders.h
evergreen_cs.c
evergreen_hdmi.c	drm/radeon/dce2: use 10khz units for audio dto calculation	2013-05-20 10:44:58 -04:00
evergreen_reg.h
evergreend.h
Kconfig
Makefile
mkregtable.c
ni.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
ni_reg.h
nid.h
ObjectID.h
r100.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
r100_track.h
r100d.h
r200.c
r300.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
r300_cmdbuf.c
r300_reg.h
r300d.h
r420.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
r420d.h
r500_reg.h
r520.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
r520d.h
r600.c	drm/radeon: fix UVD on big endian	2013-06-14 17:05:57 -04:00
r600_audio.c
r600_blit.c
r600_blit_kms.c
r600_blit_shaders.c
r600_blit_shaders.h
r600_cp.c
r600_cs.c
r600_hdmi.c	drm/radeon/dce2: use 10khz units for audio dto calculation	2013-05-20 10:44:58 -04:00
r600_reg.h
r600d.h	drm/radeon: Use direct mapping for fast fb access on RS780/RS880 (v2)	2013-06-03 10:36:21 -04:00
radeon.h	drm/radeon: track which asics have UVD	2013-05-20 12:09:37 -04:00
radeon_acpi.c
radeon_acpi.h
radeon_agp.c
radeon_asic.c	drm/radeon: Use direct mapping for fast fb access on RS780/RS880 (v2)	2013-06-03 10:36:21 -04:00
radeon_asic.h	drm/radeon: Use direct mapping for fast fb access on RS780/RS880 (v2)	2013-06-03 10:36:21 -04:00
radeon_atombios.c
radeon_atpx_handler.c
radeon_benchmark.c
radeon_bios.c	Merge branch 'drm-radeon-sun-hainan' of git://people.freedesktop.org/~airlied/linux	2013-05-21 08:50:57 -07:00
radeon_blit_common.h
radeon_clocks.c
radeon_combios.c
radeon_connectors.c
radeon_cp.c
radeon_cs.c
radeon_cursor.c
radeon_device.c	drm/radeon: fix write back suspend regression with uvd v2	2013-06-12 08:16:29 -04:00
radeon_display.c	drm/radeon: use drm_send_vblank_event() helper	2013-05-22 09:13:41 +10:00
radeon_drv.c
radeon_drv.h
radeon_encoders.c
radeon_family.h	drm/radeon: add chip family for Hainan	2013-05-20 11:13:06 -04:00
radeon_fb.c
radeon_fence.c	drm/radeon: fix write back suspend regression with uvd v2	2013-06-12 08:16:29 -04:00
radeon_gart.c	drm/radeon: do not try to uselessly update virtual memory pagetable	2013-06-12 08:16:28 -04:00
radeon_gem.c
radeon_i2c.c
radeon_ioc32.c
radeon_irq.c
radeon_irq_kms.c
radeon_kms.c
radeon_legacy_crtc.c
radeon_legacy_encoders.c
radeon_legacy_tv.c
radeon_mem.c
radeon_mode.h
radeon_object.c	radeon: Switch to arch_phys_wc_add and add a missing ..._del	2013-05-31 13:37:34 +10:00
radeon_object.h
radeon_pm.c
radeon_prime.c
radeon_reg.h
radeon_ring.c	drm/radeon: update lockup tracking when scheduling in empty ring	2013-06-20 14:45:08 -04:00
radeon_sa.c
radeon_semaphore.c
radeon_state.c
radeon_test.c
radeon_trace.h
radeon_trace_points.c
radeon_ttm.c	drm/radeon: Fix VRAM size calculation for VRAM >= 4GB	2013-05-20 10:44:57 -04:00
radeon_uvd.c	drm/radeon: fix UVD on big endian	2013-06-14 17:05:57 -04:00
rs100d.h
rs400.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
rs400d.h
rs600.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
rs600d.h
rs690.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
rs690d.h
rv200d.h
rv250d.h
rv350d.h
rv515.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
rv515d.h
rv770.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
rv770d.h
si.c	radeon: Fix system hang issue when using KMS with older cards	2013-06-03 10:17:54 -04:00
si_blit_shaders.c
si_blit_shaders.h
si_reg.h
sid.h	drm/radeon: fill in GPU init for Hainan (v2)	2013-05-20 11:13:07 -04:00