usb4bsd: remove merge artifact
authorMarkus Pfeiffer <markus.pfeiffer@morphism.de>
Tue, 14 Jan 2014 22:02:12 +0000 (22:02 +0000)
committerMarkus Pfeiffer <markus.pfeiffer@morphism.de>
Tue, 21 Jan 2014 22:04:07 +0000 (22:04 +0000)
commitbda0a06b39d8ee23a261ed0e7fd3bb2de70ffb97
tree840c10bfcc938563767ce3dea383a488c209048d
parentce486e0815944ea3039c516b6340b5ea2ebf7ea4
usb4bsd: remove merge artifact
sys/bus/u4b/usb_dev.c