tmp_suning_uos_patched/drivers/gpu/drm/nouveau
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
..
Kconfig
Makefile
nouveau_acpi.c
nouveau_backlight.c
nouveau_bios.c
nouveau_bios.h
nouveau_bo.c
nouveau_calc.c
nouveau_channel.c
nouveau_connector.c
nouveau_connector.h
nouveau_crtc.h
nouveau_debugfs.c
nouveau_display.c
nouveau_dma.c
nouveau_dma.h
nouveau_dp.c
nouveau_drv.c
nouveau_drv.h
nouveau_encoder.h
nouveau_fb.h
nouveau_fbcon.c
nouveau_fbcon.h
nouveau_fence.c
nouveau_gem.c
nouveau_grctx.h
nouveau_hw.c
nouveau_hw.h
nouveau_i2c.c
nouveau_i2c.h
nouveau_ioc32.c
nouveau_irq.c
nouveau_mem.c
nouveau_notifier.c
nouveau_object.c
nouveau_reg.h
nouveau_sgdma.c
nouveau_state.c
nouveau_ttm.c
nv04_crtc.c
nv04_cursor.c
nv04_dac.c
nv04_dfp.c
nv04_display.c
nv04_fb.c
nv04_fbcon.c
nv04_fifo.c
nv04_graph.c
nv04_instmem.c
nv04_mc.c
nv04_timer.c
nv04_tv.c
nv10_fb.c
nv10_fifo.c
nv10_gpio.c
nv10_graph.c
nv17_tv_modes.c
nv17_tv.c
nv17_tv.h
nv20_graph.c
nv30_fb.c
nv40_fb.c
nv40_fifo.c
nv40_graph.c
nv40_grctx.c
nv40_mc.c
nv50_calc.c
nv50_crtc.c
nv50_cursor.c
nv50_dac.c
nv50_display.c
nv50_display.h
nv50_evo.h
nv50_fb.c
nv50_fbcon.c
nv50_fifo.c
nv50_gpio.c
nv50_graph.c
nv50_grctx.c
nv50_instmem.c
nv50_mc.c
nv50_sor.c
nvc0_fb.c
nvc0_fifo.c
nvc0_graph.c
nvc0_instmem.c
nvreg.h