Linus Torvalds 80a1de29a5 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.
2014-05-25 10:08:48 -07:00
..
2014-05-06 13:04:59 -07:00
2014-04-28 16:43:44 +02:00
2013-12-04 12:27:46 +01:00
2014-04-07 10:17:30 -07:00
2014-01-25 03:14:05 -05:00
2014-05-05 09:31:33 +03:00
2013-12-05 16:36:21 -06:00
2014-04-19 13:23:31 -07:00
2014-04-04 15:50:08 -07:00
2014-02-07 16:08:57 -08:00
2014-02-07 16:08:57 -08:00
2014-04-01 23:19:09 -04:00
2013-11-23 22:33:47 -08:00
2014-04-01 23:19:08 -04:00
2014-04-01 23:19:08 -04:00
2014-04-01 23:19:09 -04:00
2014-04-16 11:53:08 -07:00