tree 8217f81fbfb686c006ade225d479c9000c311e7a
parent a3fe778c7895cd847d23c25ad566d83346282a77
parent 88257360605f9362dc4d79326c268dd334f61c90
author Linus Torvalds <torvalds@linux-foundation.org> 1338847258 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1338847258 -0700

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

Pull cifs fixes from Steve French.

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Move get_next_mid to ops struct
  CIFS: Make accessing is_valid_oplock/dump_detail ops struct field safe
  CIFS: Improve identation in cifs_unlock_range
  CIFS: Fix possible wrong memory allocation