From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Dec 2021 17:32:49 +0000 (-0800)
Subject: Merge tag 'csky-for-linus-5.16-rc5' of git://github.com/c-sky/csky-linux
X-Git-Tag: v5.16-rc5~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f3d41e82d78bf521dfee4d6db1d247628dcf399;p=thirdparty%2Flinux.git

Merge tag 'csky-for-linus-5.16-rc5' of git://github.com/c-sky/csky-linux

Pull csky from Guo Ren:
 "Only one fix for csky: fix fpu config macro"

* tag 'csky-for-linus-5.16-rc5' of git://github.com/c-sky/csky-linux:
  csky: fix typo of fpu config macro
---

0f3d41e82d78bf521dfee4d6db1d247628dcf399