Merge branch 'kernel-doc' from Randy Dunlap