Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6