Guido van Rooij 4160f4c64e Resolve conflicts ... MFC after: 2 weeks		2006-08-16 12:06:35 +00:00
..
altq/altq	Do not use the TSC where its known to be broken, this will cause the queue	2006-03-02 00:51:39 +00:00
dev	The strstr() function is in the libkern now.	2006-08-12 15:29:12 +00:00
ia64/libuwx	Apply local modifications to make Unwind Express BETA 10 buildable and	2006-07-07 23:56:34 +00:00
ipfilter/netinet	Resolve conflicts	2006-08-16 12:06:35 +00:00
ngatm
pf	Import from OpenBSD 1.168, dhartmei:	2006-07-21 09:48:13 +00:00