Merge branch 'linux-2.6' into for-2.6.25
[linux-2.6] / Documentation / nmi_watchdog.txt
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2