volk: fix some ARM test functions that resulted in an infinite loop on some processors.
Merge branch 'maint'
ctrlport: Improved display handling for gr-ctrlport-monitor.
ctrlport: removed 'New Plot' toolbar button. Needs work to be useful and was actually broken.
Merge branch 'master' into next