diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-02 12:18:55 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-02 12:18:55 +0800 |
| commit | 37aa27cffb68b92b8f42d1a9f6300ed758d07552 (patch) | |
| tree | bb9cc689e044e6b127278379e181610d82def315 /arch/arm64/kernel | |
| parent | 2ea80ad4205178dcea1152c0a603f23531c5412c (diff) | |
| parent | 351d2d4d3108a9a0f0e112dabbc36c2b1446e4f8 (diff) | |
Merge tag 'v4.4.12' into linux-linaro-lsk-v4.4
This is the 4.4.12 stable release
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/cpuinfo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index 966fbd52550b..6f08c7445ecf 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -85,7 +85,8 @@ static const char *const compat_hwcap_str[] = { "idivt", "vfpd32", "lpae", - "evtstrm" + "evtstrm", + NULL }; static const char *const compat_hwcap2_str[] = { |