Merge branch 'for-3.1' of git://github.com/padovan/bluetooth-next