Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jun 2012 22:00:58 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jun 2012 22:00:58 +0000 (15:00 -0700)
commitbf2785a818372603ad3ca3abcab65010f08a1d68
tree8217f81fbfb686c006ade225d479c9000c311e7a
parenta3fe778c7895cd847d23c25ad566d83346282a77
parent88257360605f9362dc4d79326c268dd334f61c90
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