Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
[linux-2.6.git] / Documentation / zorro.txt
2005-04-16 Linus Torvalds Linux-2.6.12-rc2