diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-25 15:24:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-25 15:24:11 -0700 |
commit | 632b06aa2842b12c6d6a510ec080fb6ebdb38ea5 (patch) | |
tree | 42dee61b79734e9465001ad3bbcb7597ff3eb20e /include/net/tc_act/tc_defact.h | |
parent | 3e79d97828841305e3369ad1e07cfed5bf5989ef (diff) | |
parent | 1406b916f4a29d5f9660264a28ce609c8c77e7ae (diff) | |
download | op-kernel-dev-632b06aa2842b12c6d6a510ec080fb6ebdb38ea5.zip op-kernel-dev-632b06aa2842b12c6d6a510ec080fb6ebdb38ea5.tar.gz |
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 'include/net/tc_act/tc_defact.h')
0 files changed, 0 insertions, 0 deletions