| commit | f698f1f7ad69f700dd1c754aa2b4aa7acbd51703 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 30 14:27:01 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 30 14:27:01 2008 -0700 |
| tree | 53892eb15e0b2380d6c4e6f8321d0b8bea8de4c0 | |
| parent | a77df5cd1cde203ef11c8e5a3ca47def5f5a1687 [diff] | |
| parent | 6876b3bacaaa4c73fb8752b47c84b2b7fad5422a [diff] |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: fix for non-coherent DMA PowerPC drm: radeon: fix sparse integer as NULL pointer warnings in radeon_mem.c drm/i915: fix oops on agp=off drm/r300: fix bug in r300 userspace hardware wait emission