Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6