Merge branch 'x86/nmi' into x86/devel
[linux-2.6] / Documentation / networking / framerelay.txt
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2