Merge branch 'new_wb_intercon' into new_eth
authorMatt Ettus <matt@ettus.com>
Thu, 1 Oct 2009 02:12:23 +0000 (19:12 -0700)
committerMatt Ettus <matt@ettus.com>
Thu, 1 Oct 2009 02:12:23 +0000 (19:12 -0700)
commitd37030e27d9e9c922b432c04252b1636f5160c3c
treeb8c91637ba642ee2ac814f604aa625b2830aeb61
parent4dfa2ad7deab0a89784906b377dbea271ba08118
parent016b2fb7b8da8bf10e7ee9e6465adb8d317c0a43
Merge branch 'new_wb_intercon' into new_eth

Functionality should not change at all

Conflicts:
usrp2/fpga/top/u2_core/u2_core.v
usrp2/fpga/top/u2_core/u2_core.v