uhd - Ettus' UHD Repository

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fpga_master' into uhd_next	Josh Blum	2011-11-07	27	-372/+1342
\|
*	Merge branch 'fpga_master' into uhd_master	Josh Blum	2011-10-12	2	-2/+2
\|
*	Merge branch 'fpga_master' into uhd_master	Josh Blum	2011-09-28	9	-32/+493
\| \| \| \| \|	Conflicts: fpga/usrp1/toplevel/usrp_std/usrp_std.v
*	Merge branch 'fpga_master' into e110_support	Josh Blum	2011-09-02	1	-10/+10
\|
*	Merge branch 'fpga_master'	Josh Blum	2011-09-01	2	-1/+102
\|
*	Merge branch 'fpga_master' into next	Josh Blum	2011-08-31	26	-990/+552
\|
*	Merge branch 'fpga_patch_release' into patch_release	Josh Blum	2011-08-29	7	-29/+29
\|
*	Merge branch 'fpga_patch_release' into patch_releaserelease_003_002_002	Josh Blum	2011-08-15	8	-16/+41
\|
*	Merge branch 'atr_fix_fpga' into atr_fixrelease_003_002_000	Josh Blum	2011-07-28	13	-563/+196
\|
*	fpga: squashed new_work fpga changes onto uhd next	Josh Blum	2011-07-19	34	-4385/+150
\|
*	Merge branch 'fpga_next' into next	Josh Blum	2011-07-08	1	-1/+1
\|
*	Merge branch 'fpga_next' into next	Josh Blum	2011-07-08	47	-768/+5325
\|
*	Merge branch 'fpga_next' into uhd_next	Josh Blum	2011-06-14	301	-4201/+11113
\|
*	Merge branch 'fpga_next' into uhd_master	Josh Blum	2011-05-23	1	-1/+4
\|
*	Merge branch 'next' into use_vita_length	Josh Blum	2011-05-16	1	-1/+1
\|
*	Merge branch 'next' into use_vita_length	Josh Blum	2011-05-09	15	-393/+763
\|
*	Merge branch 'master' into next	Josh Blum	2011-04-19	1	-0/+98
\|\ \| \| \| \| \| \| \| \|	Conflicts: fpga/usrp2/top/u2plus/Makefile.N200
\| *	Merge branch 'fpga_master' into n200_support	Josh Blum	2011-03-25	1	-0/+98
\| \|
\| *	Merge branch 'fpga_master' into next	Josh Blum	2011-03-17	2	-16/+8
\| \|
* \|	Merge branch 'fpga_memory_reorg' into usrp2/new_reg_map	Josh Blum	2011-03-17	20	-465/+561
\|/
*	usrp-e100: fpga fix removed missing directory from include	Josh Blum	2011-03-10	1	-1/+0
\|
*	Merge branch 'packet_router_2nd_dsp' into next	Josh Blum	2011-03-10	50	-2153/+1096
\|
*	Merge branch 'packet_router_2nd_dsp' into usrp2_dual_dsp	Josh Blum	2011-02-22	7	-177/+275
\|
*	Merge branch 'fpga_next' into usrp_e100_devel	Josh Blum	2011-02-08	2	-29/+57
\|
*	Merge branch 'fpga_fix'	Josh Blum	2011-01-21	3	-25/+114
\|
*	uhd: removed deleted fpga files removed from fpga repo	Josh Blum	2011-01-19	3	-15/+0
\|
*	Merge branch 'fpga_next' into uhd_with_fpga_next	Josh Blum	2011-01-19	12	-238/+403
\|
*	Merge branch 'fpga_next' into next	Josh Blum	2010-12-29	4	-165/+198
\|
*	Merge branch 'fpga_next' into uhd_next	Josh Blum	2010-12-27	1	-22/+13
\|
*	Merge branch 'fpga_next' into uhd_next	Josh Blum	2010-12-22	32	-481/+3012
\|
*	Merge branch 'fpga_ise12'	Josh Blum	2010-12-13	12	-1160/+399
\|
*	Merge branch 'fpga_ise12'	Josh Blum	2010-12-09	3	-4/+18
\|
*	Merge branch 'fpga_flow_control' into next	Josh Blum	2010-11-23	1	-1/+1
\|
*	uhd: added new hardware to readme	Josh Blum	2010-11-23	1	-1/+1
\|
*	Merge branch 'fpga_next' into next	Josh Blum	2010-11-23	65	-878/+7961
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: fpga/usrp2/top/u1e_passthru/.gitignore fpga/usrp2/top/u1e_passthru/Makefile fpga/usrp2/top/u2plus/.gitignore fpga/usrp2/top/u2plus/Makefile usrp2/top/u1e_passthru/.gitignore usrp2/top/u1e_passthru/Makefile
\| *	fpga: performed a forceful checkout of fpga to overwrite with current fpga code	Josh Blum	2010-11-23	121	-1085/+11263
\| \|
* \|	Merge branch 'usrp_e100' into next	Josh Blum	2010-11-23	64	-215/+3325
\|\ \ \| \|/ \|/\| \| \| \| \|	Conflicts: images/Makefile
\| *	Merge branch 'ue1_rev2' into usrp_e_next	Josh Blum	2010-10-27	64	-215/+3325
\| \|
* \|	Merge branch 'flow_control_fpga' into flow_ctrl	Josh Blum	2010-10-22	7	-115/+304
\| \|
* \|	Merge branch 'flow_control' into flow_ctrl	Josh Blum	2010-10-14	57	-256/+10817
\|/
*	Merge branch 'ise12' into next	Josh Blum	2010-08-31	3	-29/+23
\|
*	Merge branch 'tx_policy' of ettus.sourcerepo.com:ettus/fpgapriv into premerge	Nick Foster	2010-08-16	1	-1/+1
\|
*	Merge branch 'features' into uhd_fpga_features	Josh Blum	2010-08-09	2	-3/+6
\|
*	Merge branch 'features' into uhd_fpga_features	Josh Blum	2010-08-09	23	-5878/+873
\| \| \| \| \|	Conflicts: fpga/usrp2/vrt/vita_rx_control.v
*	Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_fpga_merge	Josh Blum	2010-07-05	1	-4/+5
\|
*	Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_fpga_merge	Josh Blum	2010-06-24	1	-1/+2
\|
*	Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_master	Josh Blum	2010-06-15	268	-901/+1835
\| \| \| \| \|	Conflicts: fpga/.gitignore
*	Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpga into work	Josh Blum	2010-05-18	22	-2090/+554
\|
*	Merge branch 'shrinkfw' into usrp2	Josh Blum	2010-05-10	1	-6/+18
\|\
\| *	Added reload flag to the stream cmd.	Josh Blum	2010-04-28	1	-6/+18
\| \| \| \| \| \| \| \| \| \|	This reloads the last command to handle continuous streaming in hardware. Moved rx control register setup and stream command issuing to the host.