Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux
[linux-2.6.git] / Documentation / zorro.txt
2005-04-16 Linus Torvalds Linux-2.6.12-rc2