Merge branch 'pm-drivers'