Merge branch 'perf/urgent' into perf/core
[safe/jmp/linux-2.6] / Documentation / isapnp.txt
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2