Merge branch 'linus' into x86/memory-corruption-check
[h-e-n] / Documentation / zorro.txt
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2