Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: remove drm_{alloc,free}_pages drm: sis fix compile warning drm: add new radeon PCI ids.. drm: read breadcrumb in IRQ handler drm: fixup i915 breadcrumb read/write drm: remove pointless checks in radeon_state drm: fixup improper cast. drm: rationalise some pci ids drm: Add general-purpose packet for manipulating scratch registers (r300) drm: rework radeon memory map (radeon 1.23) drm: update r300 register names drm: fixup PCI DMA support
No related branches found
No related tags found
Showing
- drivers/char/drm/drmP.h 7 additions, 9 deletionsdrivers/char/drm/drmP.h
- drivers/char/drm/drm_bufs.c 11 additions, 9 deletionsdrivers/char/drm/drm_bufs.c
- drivers/char/drm/drm_dma.c 1 addition, 3 deletionsdrivers/char/drm/drm_dma.c
- drivers/char/drm/drm_memory.c 0 additions, 59 deletionsdrivers/char/drm/drm_memory.c
- drivers/char/drm/drm_memory_debug.h 0 additions, 70 deletionsdrivers/char/drm/drm_memory_debug.h
- drivers/char/drm/drm_pci.c 25 additions, 4 deletionsdrivers/char/drm/drm_pci.c
- drivers/char/drm/drm_pciids.h 79 additions, 37 deletionsdrivers/char/drm/drm_pciids.h
- drivers/char/drm/i915_dma.c 0 additions, 2 deletionsdrivers/char/drm/i915_dma.c
- drivers/char/drm/i915_irq.c 2 additions, 0 deletionsdrivers/char/drm/i915_irq.c
- drivers/char/drm/r300_cmdbuf.c 78 additions, 8 deletionsdrivers/char/drm/r300_cmdbuf.c
- drivers/char/drm/r300_reg.h 32 additions, 7 deletionsdrivers/char/drm/r300_reg.h
- drivers/char/drm/radeon_cp.c 108 additions, 43 deletionsdrivers/char/drm/radeon_cp.c
- drivers/char/drm/radeon_drm.h 5 additions, 0 deletionsdrivers/char/drm/radeon_drm.h
- drivers/char/drm/radeon_drv.h 17 additions, 8 deletionsdrivers/char/drm/radeon_drv.h
- drivers/char/drm/radeon_state.c 47 additions, 58 deletionsdrivers/char/drm/radeon_state.c
- drivers/char/drm/sis_mm.c 1 addition, 1 deletiondrivers/char/drm/sis_mm.c
Loading
Please register or sign in to comment