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: fix radeon setparam on 32/64 bit systems. drm/i915: Add support for the G33, Q33, and Q35 chipsets. i915: add new pciids for 945GME, 965GME/GLE
Showing
- drivers/char/drm/drm_pciids.h 5 additions, 0 deletionsdrivers/char/drm/drm_pciids.h
- drivers/char/drm/i915_dma.c 72 additions, 18 deletionsdrivers/char/drm/i915_dma.c
- drivers/char/drm/i915_drm.h 5 additions, 0 deletionsdrivers/char/drm/i915_drm.h
- drivers/char/drm/i915_drv.h 2 additions, 0 deletionsdrivers/char/drm/i915_drv.h
- drivers/char/drm/radeon_ioc32.c 26 additions, 0 deletionsdrivers/char/drm/radeon_ioc32.c
Loading
Please register or sign in to comment