Merge with /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git/