Merge branch 'mv-merge'
[linux-2.6] / drivers / video / aty / mach64_cursor.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2