Merge branch 'mergeme/cbx'
Conflicts: host/docs/calibration.rst host/lib/usrp/dboard/db_sbx_common.cpp
gps: only enable SERV:TRAC when requested
gps: flush uart buffer before waiting for time
This addresses a bug only on the master branch.Also turn off the servo sensor, its too long a delay.We will need to conditionally enable this in a later commit.
Merge branch 'maint'
e100: switch to fixed length xfers
usrp1: fix eeprom write capability through fx2
The vectorized eeprom write was faster but broken,removed overload which falls back to the one byte at a time.
lib: addresses B100 FIFO timeout error
b100: create an overflow packet on unknown SID error
Also available in: Atom