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)
commit5faa0154fe333e11ae3826296e08eada1d1d2ec8
treeeeb9478cc870d9f781d6ba66071bb5f29b14b33b
parentb9d4a35f0a5dd25b85462741a8fb539b355ea95c
parent9e6d722f3d91c94f2a303d67ddd8fb1ca4c0d375
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

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