Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
[linux-2.6] / drivers / video / maxinefb.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2