Merge branch 'for-3.15/drivers' into test