Merge branch 'wk/doc-in-linux-3.x-era'