diff options
| author | Alistair Strachan <astrachan@google.com> | 2018-10-23 12:37:23 -0700 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2018-10-23 12:44:24 -0700 |
| commit | c4b00eb7049611bc16a42ca0e21ea80f614ed3a4 (patch) | |
| tree | 28f11126fa3be137b7c246886952763d72e21401 /drivers/usb/class/cdc-acm.c | |
| parent | fd73fe985329b36bbb1e0070d67da639c12b187c (diff) | |
Revert "BACKPORT, FROMLIST: fscrypt: add Speck128/256 support"
This reverts commit 4b08356a76b859b8f4599bf8821a6702ac50a029.
Resolves conflicts with a later CL, e7724207f71e "fscrypt: log the
crypto algorithm implementations".
[astrachan: This is an update to 076c36fce1ea which reverted only
the fscrypt changes, not the ext4 changes, due to a
historical bad merge.]
Bug: 116008047
Change-Id: I772d78d6e4bd126dcd2b25049c719f8522a1c157
Signed-off-by: Alistair Strachan <astrachan@google.com>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
0 files changed, 0 insertions, 0 deletions