projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e79d97 1406b91)
Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Mar 2014 22:24:11 +0000 (15:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Mar 2014 22:24:11 +0000 (15:24 -0700)
commit632b06aa2842b12c6d6a510ec080fb6ebdb38ea5
tree42dee61b79734e9465001ad3bbcb7597ff3eb20etree | snapshot
parent3e79d97828841305e3369ad1e07cfed5bf5989efcommit | diff
parent1406b916f4a29d5f9660264a28ce609c8c77e7aecommit | diff
Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux

Pull nfsd fix frm Bruce Fields:
 "J R Okajima sent this early and I was just slow to pass it along,
  apologies.  Fortunately it's a simple fix"

* 'nfsd-next' of git://linux-nfs.org/~bfields/linux:
  nfsd: fix lost nfserrno() call in nfsd_setattr()
Linux Kernel tree with some unpolished code for Colibri/Apalis modules