Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming
[safe/jmp/linux-2.6] / Documentation / zorro.txt
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2