git: usb4bsd resolve conflicts

[Markus Pfeiffer]

commit af01b66570db49e1ebd9b51680b5d971b8378e90
Author: Markus Pfeiffer <markus.pfeiffer at morphism.de>
Date:   Thu Aug 22 20:29:37 2013 +0100

    usb4bsd resolve conflicts

Summary of changes:
 sys/bus/u4b/usbdevs        |   117 +-
 sys/bus/u4b/usbdevs.h      |  4459 +++++++++
 sys/bus/u4b/usbdevs_data.h | 21031 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 25604 insertions(+), 3 deletions(-)
 create mode 100644 sys/bus/u4b/usbdevs.h
 create mode 100644 sys/bus/u4b/usbdevs_data.h

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/af01b66570db49e1ebd9b51680b5d971b8378e90


-- 
DragonFly BSD source repository