This resolves the conflict with: drivers/staging/comedi/drivers/amplc_dio200.c and syncs up the changes that happened in the staging directory for 3.7-rc3. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
dgrp_common.c | ||
dgrp_common.h | ||
dgrp_dpa_ops.c | ||
dgrp_driver.c | ||
dgrp_mon_ops.c | ||
dgrp_net_ops.c | ||
dgrp_ports_ops.c | ||
dgrp_specproc.c | ||
dgrp_sysfs.c | ||
dgrp_tty.c | ||
digirp.h | ||
drp.h | ||
Kconfig | ||
Makefile | ||
README | ||
TODO |
The user space code to work with this driver is located at https://github.com/wfp5p/dgrp-utils