original_kernel/drivers/gpu/drm/radeon
Linus Torvalds aa9f56b66d Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (55 commits)
  io-mapping: move asm include inside the config option
  vgaarb: drop vga.h include
  drm/radeon: Add probing of clocks from device-tree
  drm/radeon: drop old and broken mesa warning
  drm/radeon: Fix pci_map_page() error checking
  drm: Remove count_lock for calling lastclose() after 58474713 (v2)
  drm/radeon/kms: allow FG_ALPHA_VALUE on r5xx
  drm/radeon/kms: another r6xx/r7xx CS checker fix
  DRM: Replace kmalloc/memset combos with kzalloc
  drm: expand gamma_set
  drm/edid: Split mode lists out to their own header for readability
  drm/edid: Rewrite mode parse to use the generic detailed block walk
  drm/edid: Add detailed block walk for VTB extensions
  drm/edid: Add detailed block walk for CEA extensions
  drm: Remove unused fields from drm_display_info
  drm: Use ENOENT consistently for the error return for an unmatched handle.
  drm/radeon/kms: mark 3D power states as performance
  drm: Only set DPMS once on the CRTC not after every encoder.
  drm/radeon/kms: add additional quirk for Acer rv620 laptop
  drm: Propagate error code from fb_create()
  ...

Fix up trivial conflicts in drivers/gpu/drm/drm_edid.c
2010-08-12 09:21:39 -07:00
..
reg_srcs
.gitignore
Kconfig
Makefile
ObjectID.h
atom-bits.h
atom-names.h
atom-types.h
atom.c
atom.h
atombios.h
atombios_crtc.c
atombios_dp.c
avivod.h
evergreen.c
evergreen_cs.c
evergreen_reg.h
evergreend.h
mkregtable.c
r100.c
r100_track.h
r100d.h
r200.c
r300.c
r300_cmdbuf.c
r300_reg.h
r300d.h
r420.c
r420d.h
r500_reg.h
r520.c
r520d.h
r600.c
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
r600_reg.h
r600d.h
radeon.h
radeon_acpi.c
radeon_agp.c
radeon_asic.c
radeon_asic.h
radeon_atombios.c
radeon_atpx_handler.c
radeon_benchmark.c
radeon_bios.c
radeon_clocks.c drm/radeon: Add probing of clocks from device-tree 2010-08-12 09:41:20 +10:00
radeon_combios.c
radeon_connectors.c
radeon_cp.c
radeon_cs.c
radeon_cursor.c
radeon_device.c
radeon_display.c
radeon_drv.c
radeon_drv.h
radeon_encoders.c
radeon_family.h
radeon_fb.c
radeon_fence.c
radeon_gart.c
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_object.h
radeon_pm.c
radeon_reg.h
radeon_ring.c
radeon_state.c
radeon_test.c
radeon_ttm.c
rs100d.h
rs400.c
rs400d.h
rs600.c
rs600d.h
rs690.c
rs690d.h
rv200d.h
rv250d.h
rv350d.h
rv515.c
rv515d.h
rv770.c
rv770d.h