git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3496f92
feaf384
)
Merge branch 'master' into next
author
James Morris
<jmorris@namei.org>
Thu, 4 Dec 2008 06:16:36 +0000
(17:16 +1100)
committer
James Morris
<jmorris@namei.org>
Thu, 4 Dec 2008 06:16:36 +0000
(17:16 +1100)
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff