From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jun 2012 22:00:58 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bf2785a818372603ad3ca3abcab65010f08a1d68;p=openwrt%2Fstaging%2Fblogic.git

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
---

bf2785a818372603ad3ca3abcab65010f08a1d68