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:
c32e7d6
985ca0e
)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptf...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:43:50 +0000
(23:43 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:43:50 +0000
(23:43 -0700)
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
ecryptfs: Make inode bdi consistent with superblock bdi
eCryptfs: Unlock keys needed by ecryptfsd
Trivial merge