Sam Leffler 93057fddc1 resolve merge conflicts ... MFC after: 1 month		2006-06-05 17:46:41 +00:00
..
acpica	This commit was generated by cvs2svn to compensate for changes in r152069,	2005-11-04 21:29:41 +00:00
ath	resolve merge conflicts	2006-06-05 17:46:41 +00:00
nve	This commit was generated by cvs2svn to compensate for changes in r153200,	2005-12-07 17:32:13 +00:00
oltr	Since DELAY() was moved, most <machine/clock.h> #includes have been	2006-05-16 14:37:58 +00:00