Merge branch 'for-3.15/ll-driver-new-callbacks' into for-linus