Sam Leffler 7a4700cda9 resolve merge conflict		2004-12-08 18:18:39 +00:00
..
acpica	This commit was generated by cvs2svn to compensate for changes in r138298,	2004-12-02 00:12:19 +00:00
ath	resolve merge conflict	2004-12-08 18:18:39 +00:00
hptmv	Fix some warnings that only triggered in LINT.	2004-10-24 09:23:07 +00:00
oltr	Since if_oltr doesn't contain locking or run with INTR_MPSAFE, mark	2004-08-14 00:19:07 +00:00