]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2021 15:56:51 +0000 (05:56 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2021 15:56:51 +0000 (05:56 -1000)
commit84a88e5c4c146f20d482c200e830e4fab44b71a4
tree1c525ed663ff80bb8ddc3653274ff28b7ef475ac
parentc36fbb5829c9496022d1d4c5a68520a71b95a885
parentca2cf27f52352d7b4b07410e6f38a5a1209ea292
Merge tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

Pull nios2 fix from Dinh Nguyen:

 - Renamed CTL_STATUS to CTL_FSTATUS to fix a redefined warning

* tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  NIOS2: irqflags: rename a redefined register name