OSDN Git Service
(root)
/
android-x86
/
system-extras.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
af30023
f266c1a
)
Merge changes from topic 'ext4_encryption_flag'
author
Tom Cherry
<tomcherry@google.com>
Fri, 14 Jul 2017 23:06:30 +0000
(23:06 +0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Fri, 14 Jul 2017 23:06:30 +0000
(23:06 +0000)
* changes:
ext4_sb.h: make feature flags in fs_info 32-bit
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT
Trivial merge