diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 00:26:27 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 00:26:27 +0200 |
commit | 63e8d9114dab88c101be2372cb1f83a4fe74d9c1 (patch) | |
tree | 424e8f1bdc1daf12ad83a64958156245cd9f1de8 /drivers/char/istallion.c | |
parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
parent | drm: remove drm_{alloc,free}_pages (diff) | |
download | linux-63e8d9114dab88c101be2372cb1f83a4fe74d9c1.tar.xz linux-63e8d9114dab88c101be2372cb1f83a4fe74d9c1.zip |
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
Diffstat (limited to 'drivers/char/istallion.c')
0 files changed, 0 insertions, 0 deletions