Merge branch 'cifs-3.2' of git://git.samba.org/jlayton/linux into temp-3.2-jeff