Merge branch 'docs-3.4' of git://git.samba.org/jlayton/linux