projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[powerpc.git]
/
fs
/
nfsd
/
nfs4recover.c
diff --git
a/fs/nfsd/nfs4recover.c
b/fs/nfsd/nfs4recover.c
index
6f03918
..
1602cd0
100644
(file)
--- a/
fs/nfsd/nfs4recover.c
+++ b/
fs/nfsd/nfs4recover.c
@@
-43,7
+43,7
@@
#include <linux/file.h>
#include <linux/namei.h>
#include <asm/uaccess.h>
-#include <
asm
/scatterlist.h>
+#include <
linux
/scatterlist.h>
#include <linux/crypto.h>
#include <linux/sched.h>