aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp1/common/fpga_regs_standard.v
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fpga_master' into uhd_masterJosh Blum2011-09-281-0/+256
Conflicts: fpga/usrp1/toplevel/usrp_std/usrp_std.v