OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8f2a002
93c3fe4
)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:10:43 +0000
(14:10 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:10:43 +0000
(14:10 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
eCryptfs: Fix encrypted file name lookup regression
ecryptfs: properly mark init functions
fs/ecryptfs: Return -ENOMEM on memory allocation failure
Trivial merge