diff options
author | sam <sam@FreeBSD.org> | 2006-02-10 19:01:02 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2006-02-10 19:01:02 +0000 |
commit | eae844806985ca8ccfff98727e2799b3f31ef77a (patch) | |
tree | b83e5a51db93c919482e068bcdcf4029c2d2e294 /sys/dev/ath/if_athvar.h | |
parent | 066a4db4b427ac9b7f3263e00456398b34ba81cb (diff) | |
download | FreeBSD-src-eae844806985ca8ccfff98727e2799b3f31ef77a.zip FreeBSD-src-eae844806985ca8ccfff98727e2799b3f31ef77a.tar.gz |
resolve merge conflicts
MFC after: 2 weeks
Diffstat (limited to 'sys/dev/ath/if_athvar.h')
0 files changed, 0 insertions, 0 deletions