sam eae8448069 resolve merge conflicts ... MFC after: 2 weeks		2006-02-10 19:01:02 +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-02-10 19:01:02 +00:00
nve	This commit was generated by cvs2svn to compensate for changes in r153200,	2005-12-07 17:32:13 +00:00
oltr	- Store pointer to the link-level address right in "struct ifnet"	2005-11-11 16:04:59 +00:00