diff options
| author | Mike Fiore <mfiore@multitech.com> | 2014-10-09 07:38:20 -0500 |
|---|---|---|
| committer | Mike Fiore <mfiore@multitech.com> | 2014-10-09 07:38:20 -0500 |
| commit | af9b6ed9b53e34ff170645a114f95e82cbfe0101 (patch) | |
| tree | 591634acb576d39b888d2131de84c6002a11e774 /io-tool/mts-io-sysfs-inc.sh | |
| parent | da1090a73f312b14db0d7a93a9c9373fffd34958 (diff) | |
| parent | 44f859e243f646f3d2bd9540027816e3b4981ab9 (diff) | |
| download | mts-io-af9b6ed9b53e34ff170645a114f95e82cbfe0101.tar.gz mts-io-af9b6ed9b53e34ff170645a114f95e82cbfe0101.tar.bz2 mts-io-af9b6ed9b53e34ff170645a114f95e82cbfe0101.zip | |
Merge branch 'mtr2d2' into 'master'
Conflicts:
io-module/mtdc_gpiob.c - remove, replaced by mtac_gpiob.c
io-module/mtr2.c - remove, dropping support for this HW
io-module/mts_io.c - keep changes from mtr2d2 branch
io-module/spi.c - remove, no longer needed
Diffstat (limited to 'io-tool/mts-io-sysfs-inc.sh')
0 files changed, 0 insertions, 0 deletions