Merge branch 'topic/hwdep-cleanup' into for-linus