]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Dec 2014 05:09:57 +0000 (21:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Dec 2014 05:09:57 +0000 (21:09 -0800)
Pull CIFS fixes from Steve French:
 "A set of three minor cifs fixes"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: make new inode cache when file type is different
  Fix signed/unsigned pointer warning
  Convert MessageID in smb2_hdr to LE


Trivial merge