diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
commit | 7ad3423ebb02f340671f70a916bdc8dbec7573ee (patch) | |
tree | b9168d363c24f2af2626e63011ec1f6c81e81d09 /arch/arm64/include/asm/cacheflush.h | |
parent | 56a23ee52611ca76421f3d7cac100e1616716dae (diff) | |
parent | 44be77c590f381bc629815ac789b8b15ecc4ddcf (diff) | |
download | talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.tar.gz talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.zip |
Merge branch 'for-linus' into for-next
Back-merge the upstream branch for applying further cleanup patches
for HD-Audio.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'arch/arm64/include/asm/cacheflush.h')
-rw-r--r-- | arch/arm64/include/asm/cacheflush.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h index 76d1cc85d5b1..955130762a3c 100644 --- a/arch/arm64/include/asm/cacheflush.h +++ b/arch/arm64/include/asm/cacheflush.h @@ -38,7 +38,7 @@ * * See Documentation/cachetlb.txt for more information. Please note that * the implementation assumes non-aliasing VIPT D-cache and (aliasing) - * VIPT or ASID-tagged VIVT I-cache. + * VIPT I-cache. * * flush_cache_mm(mm) * |