572bc2d Revert conflicting commits regarding usrp

Authored and Committed by jskarvad 12 years ago
1 file changed. 3 lines added. 19 lines removed.
    Revert conflicting commits regarding usrp
    
        
file modified
+3 -19