Sam Leffler 93057fddc1 resolve merge conflicts ...

MFC after:	1 month

2006-06-05 17:46:41 +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

resolve merge conflicts

2006-06-05 17:46:41 +00:00

ia64/libuwx

…

ipfilter/netinet

fix "ipf -Z" reporting rubbish and possibly panic'ing box

2006-04-18 13:24:14 +00:00

ngatm

This commit was generated by cvs2svn to compensate for changes in r146539,

2005-05-23 13:08:32 +00:00

pf

Put debugging messages related to inconsistent ticket numbers under misc and

2006-05-12 16:15:34 +00:00