diff options
| author | Linus Torvalds | 2014-03-25 23:24:11 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-03-25 23:24:11 +0100 |
| commit | 632b06aa2842b12c6d6a510ec080fb6ebdb38ea5 (patch) | |
| tree | 42dee61b79734e9465001ad3bbcb7597ff3eb20e /net/ipv4/gre_demux.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | nfsd: fix lost nfserrno() call in nfsd_setattr() (diff) | |
| download | kernel-qcow2-linux-632b06aa2842b12c6d6a510ec080fb6ebdb38ea5.tar.gz kernel-qcow2-linux-632b06aa2842b12c6d6a510ec080fb6ebdb38ea5.tar.xz kernel-qcow2-linux-632b06aa2842b12c6d6a510ec080fb6ebdb38ea5.zip | |
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()
Diffstat (limited to 'net/ipv4/gre_demux.c')
0 files changed, 0 insertions, 0 deletions