Merge commit 'origin/HEAD' into test-merge
[linux-2.6] / include / video / radeon.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2