git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0374300 27b1142)
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 May 2014 17:08:48 +0000 (10:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 May 2014 17:08:48 +0000 (10:08 -0700)
commit80a1de29a5a67abac02cb10c32545eb231e0e778
treee66ae4c98b1c4b09df1bed1c91661d8017c3f9e5tree | snapshot
parent037430078fbbb956a9bd6ada00f528e9d1e4c92ccommit | diff
parent27b11428b7de097c42f205beabb1764f4365443bcommit | diff
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux

Pull two nfsd bugfixes from Bruce Fields:
 "Just two bugfixes, one for a merge-window-introduced ACL regression,
  the other for a longer-standing v4 state bug"

* 'for-3.15' of git://linux-nfs.org/~bfields/linux:
  nfsd4: warn on finding lockowner without stateid's
  nfsd4: remove lockowner when removing lock stateid
  nfsd4: fix corruption on setting an ACL.
Pandora Kernel Repository