ASI2610B: Remove spidev2.1, so as not to conflict with bluewire connection to spidev1.1 on ASI2610B
Merge branch 'asi1230-upstream-tracking' into asi1230-master