Merge branch 'for-3.15/sony' into for-3.15/hid-core-ll-transport-cleanup