Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/wireless-2.6
[cascardo/linux.git] / Documentation / nmi_watchdog.txt
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2