diff options
author | Matt Ettus <matt@ettus.com> | 2011-06-15 16:38:19 -0700 |
---|---|---|
committer | Matt Ettus <matt@ettus.com> | 2011-06-15 16:38:19 -0700 |
commit | 8ec416f692d41a2c5a75c0423fae464c81f7ef01 (patch) | |
tree | ccffad4967292558598ef86d252fa4debc25c3c3 /usrp2/simple_gemac | |
parent | 578df09d342f3b6b35cff09a13241f978971ccac (diff) | |
parent | 4573bf14029c800700f3818aeef6301464e56311 (diff) | |
download | uhd-8ec416f692d41a2c5a75c0423fae464c81f7ef01.tar.gz uhd-8ec416f692d41a2c5a75c0423fae464c81f7ef01.tar.bz2 uhd-8ec416f692d41a2c5a75c0423fae464c81f7ef01.zip |
Merge branch 'usrp_e100_aux_spi' into dsp_rebase
* usrp_e100_aux_spi:
usrp-e100: removed passthrough files, not needed w/ aux spi for clock chip
usrp-e100: make reg_test32 persistent across resets, bump compat number
usrp-e100: work on aux spi
Conflicts:
usrp2/top/E1x0/u1e_core.v
Diffstat (limited to 'usrp2/simple_gemac')
0 files changed, 0 insertions, 0 deletions