Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7