diff options
| author | obrien <obrien@FreeBSD.org> | 1999-08-28 11:27:19 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-08-28 11:27:19 +0000 |
| commit | 3a35f41abcb654dd8766e98b3e8b02776e947018 (patch) | |
| tree | c11b9b853a16020c89bbde0fa9a6426d8133d8e7 /sys/dev/usb/ugen.c | |
| parent | 5de32d64c2c9e2b5b676bc330ca5acb1bd18995f (diff) | |
| download | FreeBSD-src-3a35f41abcb654dd8766e98b3e8b02776e947018.zip FreeBSD-src-3a35f41abcb654dd8766e98b3e8b02776e947018.tar.gz | |
Fix conflicts.
This brings revs 1.{2,3} minus rev 1.4 into EGCS 1.1.2.
Diffstat (limited to 'sys/dev/usb/ugen.c')
0 files changed, 0 insertions, 0 deletions
