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